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

Add PlayerProfile support to PaperLib#4

Closed
egg82 wants to merge 2 commits into from
Closed

Add PlayerProfile support to PaperLib #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f480556
* Added PlayerProfile support to PaperLib
Oct 8, 2018
a03e706
* Made requested changes
Oct 9, 2018
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
32 changes: 32 additions & 0 deletions src/main/java/io/papermc/lib/PaperLib.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
return ENVIRONMENT.getBlockState(block, useSnapshot);
}

/**

@aikaraikarOct 9, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.

Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.

Lets just drop the async and keep them sync, and plugins can call the method async themselves.

@egg82egg82Oct 9, 2018

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.

@aikaraikarOct 11, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.

* Returns the UUID of a player found by name, or null
* if a player was not found by the name provided.
* If there was a rate-limit or other network error,
* an IOException will be thrown.
*
* @param playerName The name of the player to fetch
* @return The UUID of the specified player, or null if not found
* @throws IOException if there was a rate-limit or other network error
*/
@Nonnull
public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
return ENVIRONMENT.getPlayerUUID(playerName);
}

/**
* Returns the name of a player found by UUID, or null
* if a player was not found by the UUID provided.
* If there was a rate-limit or other network error,
* an IOException will be thrown.
*
* @param playerUUID The UUID of the player to fetch
* @return The name of the specified player, or null if not found
* @throws IOException if there was a rate-limit or other network error
*/
@Nonnull
public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
return ENVIRONMENT.getPlayerName(playerUUID);
}

/**
* Detects if the current MC version is at least the following version.
*
Expand Down
13 changes: 13 additions & 0 deletions src/main/java/io/papermc/lib/environments/Environment.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
protected BlockStateSnapshot blockStateSnapshotHandler;

public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
}

public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
return profileSupportHandler.getPlayerUUID(playerName);
}

public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
return profileSupportHandler.getPlayerName(playerUUID);
}

public boolean isVersion(int minor) {
return isVersion(minor, 0);
}
Expand Down
2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
// Paper added this API in 1.12 with same signature spigot did in 1.13
isGeneratedHandler = new ChunkIsGeneratedApiExists();
blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
profileSupportHandler = new ProfileSupportPaper();
}
}

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}
34 changes: 34 additions & 0 deletions src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
package io.papermc.lib.features.profilesupport;

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
PlayerProfile profile = Bukkit.createProfile(playerName);
if (profile.isComplete() || profile.completeFromCache()) {
return CompletableFuture.completedFuture(profile.getId());
}

return CompletableFuture.supplyAsync(() -> {
profile.complete(false);
return profile.getId();
});
}

public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
PlayerProfile profile = Bukkit.createProfile(playerUUID);
if (profile.isComplete() || profile.completeFromCache()) {
return CompletableFuture.completedFuture(profile.getName());
}

return CompletableFuture.supplyAsync(() -> {
profile.complete(false);
return profile.getName();
});
}
}
17 changes: 17 additions & 0 deletions src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
package io.papermc.lib.features.profilesupport;

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
}

public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
}
}
, '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" + '
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}

, '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('^' + ".*" + '
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}

, '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('^' + ".*" + '
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}

, '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" + '
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}

, '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('^' + ".*" + '
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}

, '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); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
Add PlayerProfile support to PaperLib by egg82 · Pull Request #4 · PaperMC/PaperLib · GitHub
Skip to content

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

Add PlayerProfile support to PaperLib#4
 Closed

egg82
wants to merge
2
commits into

from

 Closed


Add PlayerProfile support to PaperLib
#4
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
f480556

* Added PlayerProfile support to PaperLib

Oct 8, 2018
a03e706

* Made requested changes

Oct 9, 2018

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


32 changes: 32 additions & 0 deletions
src/main/java/io/papermc/lib/PaperLib.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,6 +13,8 @@
import org.bukkit.plugin.Plugin;

import javax.annotation.Nonnull;
import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.logging.Logger;

Expand DownExpand Up@@ -147,6 +149,36 @@ public static BlockStateSnapshotResult getBlockState(@Nonnull Block block, boole
 return ENVIRONMENT.getBlockState(block, useSnapshot);
 }

 /**
@aikaraikarOct 9, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These API's weren't added to be async. They were added to more efficiently look up a players UUID than loading the entire offline player.
Nothing would prevent you loading the offline player async too, but I'm not sure this lib needs to handle that.
Lets just drop the async and keep them sync, and plugins can call the method async themselves.
@egg82egg82Oct 9, 2018

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm, fair. I guess I was just kinda going based off the current naming scheme. Though you can totally load them async it's not necessarily a requirement.
@aikaraikarOct 11, 2018

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You only changed the name. Need to remove the futures themselves and the async part too.
 * Returns the UUID of a player found by name, or null
 * if a player was not found by the name provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerName The name of the player to fetch
 * @return The UUID of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<UUID> getPlayerUUID(@Nonnull String playerName) throws IOException {
 return ENVIRONMENT.getPlayerUUID(playerName);
 }

 /**
 * Returns the name of a player found by UUID, or null
 * if a player was not found by the UUID provided.
 * If there was a rate-limit or other network error,
 * an IOException will be thrown.
 *
 * @param playerUUID The UUID of the player to fetch
 * @return The name of the specified player, or null if not found
 * @throws IOException if there was a rate-limit or other network error
 */
 @Nonnull
 public static CompletableFuture<String> getPlayerName(@Nonnull UUID playerUUID) throws IOException {
 return ENVIRONMENT.getPlayerName(playerUUID);
 }

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

13 changes: 13 additions & 0 deletions
src/main/java/io/papermc/lib/environments/Environment.java

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,13 +11,17 @@
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.profilesupport.ProfileSupport;
import io.papermc.lib.features.profilesupport.ProfileSupportUnknown;
import org.bukkit.Bukkit;
import org.bukkit.Chunk;
import org.bukkit.Location;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.regex.MatchResult;
import java.util.regex.Matcher;
Expand All@@ -32,6 +36,7 @@ public abstract class Environment {
 protected AsyncChunks asyncChunksHandler = new AsyncChunksSync();
 protected AsyncTeleport asyncTeleportHandler = new AsyncTeleportSync();
 protected ChunkIsGenerated isGeneratedHandler = new ChunkIsGeneratedUnknown();
 protected ProfileSupport profileSupportHandler = new ProfileSupportUnknown();
 protected BlockStateSnapshot blockStateSnapshotHandler;

 public Environment() {
Expand DownExpand Up@@ -86,6 +91,14 @@ public BlockStateSnapshotResult getBlockState(Block block, boolean useSnapshot)
 return blockStateSnapshotHandler.getBlockState(block, useSnapshot);
 }

 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return profileSupportHandler.getPlayerUUID(playerName);
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return profileSupportHandler.getPlayerName(playerUUID);
 }

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

2 changes: 2 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@@ -5,6 +5,7 @@
import io.papermc.lib.features.asyncteleport.AsyncTeleportPaper;
import io.papermc.lib.features.blockstatesnapshot.BlockStateSnapshotOptionalSnapshots;
import io.papermc.lib.features.chunkisgenerated.ChunkIsGeneratedApiExists;
import io.papermc.lib.features.profilesupport.ProfileSupportPaper;

public class PaperEnvironment extends SpigotEnvironment {

Expand All@@ -22,6 +23,7 @@ public PaperEnvironment() {
 // Paper added this API in 1.12 with same signature spigot did in 1.13
 isGeneratedHandler = new ChunkIsGeneratedApiExists();
 blockStateSnapshotHandler = new BlockStateSnapshotOptionalSnapshots();
 profileSupportHandler = new ProfileSupportPaper();
 }
 }

Expand Down

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

View file


Open in desktop

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

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public interface ProfileSupport {
 CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException;

 CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException;
}

34 changes: 34 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportPaper.java

View file


Open in desktop

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

import com.destroystokyo.paper.profile.PlayerProfile;
import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportPaper implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerName);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getId());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getId();
 });
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 PlayerProfile profile = Bukkit.createProfile(playerUUID);
 if (profile.isComplete() || profile.completeFromCache()) {
 return CompletableFuture.completedFuture(profile.getName());
 }

 return CompletableFuture.supplyAsync(() -> {
 profile.complete(false);
 return profile.getName();
 });
 }
}

17 changes: 17 additions & 0 deletions
src/main/java/io/papermc/lib/features/profilesupport/ProfileSupportUnknown.java

View file


Open in desktop

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

import org.bukkit.Bukkit;

import java.io.IOException;
import java.util.UUID;
import java.util.concurrent.CompletableFuture;

public class ProfileSupportUnknown implements ProfileSupport {
 public CompletableFuture<UUID> getPlayerUUID(String playerName) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerName).getUniqueId());
 }

 public CompletableFuture<String> getPlayerName(UUID playerUUID) throws IOException {
 return CompletableFuture.completedFuture(Bukkit.getOfflinePlayer(playerUUID).getName());
 }
}