Upstream/LibsDisguises
1
0
Fork 1
mirror of https://github.com/libraryaddict/LibsDisguises.git synced 2025-01-18 21:01:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Promote MineSkin

Browse Source
This commit is contained in:
libraryaddict 2024-07-11 21:05:47 +12:00
parent cc1d1fd97a
commit 34b2fb09bb
5 changed files with 41 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java
View File

@ -118,7 +118,7 @@ public class GrabHeadCommand implements CommandExecutor {
}
};
SkinUtils.grabSkin(skin, callback);
SkinUtils.grabSkin(sender, skin, callback);
return true;
}

2
plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabSkinCommand.java
View File

@ -136,7 +136,7 @@ public class GrabSkinCommand implements CommandExecutor {
}
};
SkinUtils.grabSkin(skin, callback);
SkinUtils.grabSkin(sender, skin, callback);
return true;
}

2
plugin/src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java
View File

@ -117,7 +117,7 @@ public class SaveDisguiseCommand implements CommandExecutor {
String[] finalArgs = args;
SkinUtils.grabSkin(args[skinId], new SkinUtils.SkinCallback() {
SkinUtils.grabSkin(sender, args[skinId], new SkinUtils.SkinCallback() {
private final BukkitTask runnable = new BukkitRunnable() {
@Override
public void run() {

38
plugin/src/main/java/me/libraryaddict/disguise/utilities/SkinUtils.java
View File

@ -6,11 +6,14 @@ import me.libraryaddict.disguise.LibsDisguises;
import me.libraryaddict.disguise.utilities.mineskin.MineSkinResponse;
import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
import me.libraryaddict.disguise.utilities.translations.LibsMsg;
import org.bukkit.ChatColor;
import org.bukkit.command.CommandSender;
import org.bukkit.scheduler.BukkitRunnable;
import java.io.File;
import java.util.Locale;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
/**
@ -30,6 +33,30 @@ public class SkinUtils {
NORMAL
}
private static int skinsSinceLastPromotion = 0;
private static long timeSinceLastPromotion = 0;
public static void attemptPromoteMineskin(CommandSender sender) {
if (skinsSinceLastPromotion++ < 5 || timeSinceLastPromotion + TimeUnit.DAYS.toMillis(2) > System.currentTimeMillis() ||
DisguiseUtilities.getMineSkinAPI().getApiKey() != null) {
return;
}
skinsSinceLastPromotion = 0;
timeSinceLastPromotion = System.currentTimeMillis();
String message = ChatColor.AQUA +
"Enjoying the ability to create player skins via file & url? You're using MineSkin which is run by Haylee // inventivetalent!" +
" If you have the time, a small donation would be appreciated to help cover server costs https://support.inventivetalent.org/";
// No opt-out!
if (sender == null) {
LibsDisguises.getInstance().getLogger().info(message);
} else {
sender.sendMessage(message);
}
}
public static void handleFile(File file, ModelType modelType, SkinCallback callback) {
new BukkitRunnable() {
@Override
@ -157,7 +184,12 @@ public class SkinUtils {
return null;
}
@Deprecated
public static void grabSkin(String param, SkinCallback callback) {
grabSkin(null, param, callback);
}
public static void grabSkin(CommandSender sender, String param, SkinCallback callback) {
ModelType modelType = param.toLowerCase(Locale.ENGLISH).endsWith(":slim") ? ModelType.SLIM : ModelType.NORMAL;
if (modelType == ModelType.SLIM) {
@ -169,6 +201,7 @@ public class SkinUtils {
callback.onInfo(LibsMsg.SKIN_API_USING_URL);
handleUrl(param, modelType, callback);
attemptPromoteMineskin(sender);
} else {
// Check if it contains legal file characters
if (!param.matches("[a-zA-Z\\d -_]+(\\.png)?")) {
@ -193,9 +226,10 @@ public class SkinUtils {
}
if (file != null) {
// We're using a file!
callback.onInfo(LibsMsg.SKIN_API_USING_FILE);
handleFile(file, modelType, callback);
// We're using a file!
attemptPromoteMineskin(sender);
} else {
// We're using a player name or UUID!
if (param.contains("-")) {
@ -204,6 +238,7 @@ public class SkinUtils {
callback.onInfo(LibsMsg.SKIN_API_USING_UUID);
handleUUID(uuid, modelType, callback);
attemptPromoteMineskin(sender);
return;
} catch (Exception ignored) {
}
@ -220,6 +255,7 @@ public class SkinUtils {
callback.onInfo(LibsMsg.SKIN_API_USING_NAME);
handleName(param, modelType, callback);
attemptPromoteMineskin(sender);
}
}
}

2
plugin/src/main/java/me/libraryaddict/disguise/utilities/parser/DisguiseParser.java
View File

@ -322,7 +322,7 @@ public class DisguiseParser {
fetchingSkins.put(skinFile, list = new ArrayList<>());
list.add(consumer);
SkinUtils.grabSkin(skinFile, new SkinUtils.SkinCallback() {
SkinUtils.grabSkin(sender, skinFile, new SkinUtils.SkinCallback() {
@Override
public void onError(LibsMsg msg, Object... args) {
msg.send(sender, args);