Fork/CommandPanels
2
0
Fork 0
forked from Upstream/CommandPanels
Code Pull Requests Actions Releases 1 Activity

3.21.2.2

Browse Source
This commit is contained in:
rockyhawk64 2024-05-10 14:44:41 +10:00
parent ad25df283f
commit d1645d6bbb
4 changed files with 41 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
resource/plugin.yml
View File

@ -1,4 +1,4 @@
version: 3.21.2.1
version: 3.21.2.2
main: me.rockyhawk.commandpanels.CommandPanels
name: CommandPanels
author: RockyHawk

66
src/me/rockyhawk/commandpanels/classresources/GetCustomHeads.java
View File

@ -3,6 +3,7 @@ package me.rockyhawk.commandpanels.classresources;
import com.mojang.authlib.GameProfile;
import com.mojang.authlib.properties.Property;
import com.mojang.authlib.properties.PropertyMap;
import me.arcaniax.hdb.api.HeadDatabaseAPI;
import me.rockyhawk.commandpanels.CommandPanels;
import me.rockyhawk.commandpanels.ioclasses.legacy.MinecraftVersions;
import org.bukkit.Bukkit;
@ -17,10 +18,7 @@ import java.lang.reflect.Method;
import java.net.URL;
import java.net.URLConnection;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Scanner;
import java.util.UUID;
import java.util.*;
public class GetCustomHeads {
CommandPanels plugin;
@ -33,38 +31,38 @@ public class GetCustomHeads {
public String getHeadBase64(ItemStack head) {
if (plugin.getHeads.ifSkullOrHead(head.getType().toString()) && head.hasItemMeta()) {
//check if the head is a HeadDatabase head first
if(plugin.getServer().getPluginManager().isPluginEnabled("HeadDatabase")) {
HeadDatabaseAPI api = new HeadDatabaseAPI();
try {
String base64 = api.getBase64(head);
if(base64 != null){
return base64;
}
} catch (Exception ignore) {}
}
//try getting Base64 of a custom head
if (!(head.getItemMeta() instanceof SkullMeta)) return null;
SkullMeta meta = (SkullMeta) head.getItemMeta();
if (meta == null) return null;
try {
SkullMeta meta = (SkullMeta) head.getItemMeta();
assert meta != null;
if (!meta.hasOwner()) {
Field fld = meta.getClass().getDeclaredField("profile");
fld.setAccessible(true);
GameProfile prof = (GameProfile) fld.get(meta);
Iterator itr = prof.getProperties().get("textures").iterator();
if (itr.hasNext()) {
Property var5 = (Property) itr.next();
return var5.getValue();
}
}else{
Field fld = meta.getClass().getDeclaredField("profile");
fld.setAccessible(true);
GameProfile prof = (GameProfile) fld.get(meta);
Iterator itr = prof.getProperties().get("textures").iterator();
if (itr.hasNext()) {
Property var5 = (Property) itr.next();
String var5string = var5.toString();
var5string = var5string.replace("Property[","");
var5string = var5string.replace("]","");
String[] var5strings = var5string.split(",");
for(String var : var5strings){
if(var.contains("value= ")){
var = var.replace("value= ", "");
return var;
}
}
}
Field profileField = meta.getClass().getDeclaredField("profile");
profileField.setAccessible(true);
GameProfile profile = (GameProfile) profileField.get(meta);
Collection<Property> textures = profile.getProperties().get("textures");
if (!textures.isEmpty()) {
// Directly accessing fields within the Property object via reflection.
Property textureProperty = textures.iterator().next();
Field valueField = textureProperty.getClass().getDeclaredField("value");
valueField.setAccessible(true);
return (String) valueField.get(textureProperty);
}
}catch(Exception exc){/*skip return null*/}
} catch (Exception error) {
plugin.debug(error, null);
}
}
return null;
}

12
src/me/rockyhawk/commandpanels/classresources/ItemCreation.java
View File

@ -424,12 +424,12 @@ public class ItemCreation {
if(plugin.getHeads.ifSkullOrHead(cont.getType().toString())){
if(!Objects.requireNonNull(file.getString("panels." + panelName + ".item." + i + ".material")).contains("%") && !Objects.requireNonNull(file.getString("panels." + panelName + ".item." + i + ".material")).contains("=")) {
SkullMeta meta = (SkullMeta) cont.getItemMeta();
if (plugin.customHeads.getHeadBase64(cont) != null && !plugin.legacy.MAJOR_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_12)) {
if (plugin.customHeads.getHeadBase64(cont) != null) {
//inject base64 here, disable for legacy as is not working
file.set("panels." + panelName + ".item." + i + ".material", "cps= " + plugin.customHeads.getHeadBase64(cont));
} else if (meta.hasOwner()) {
//check for skull owner
file.set("panels." + panelName + ".item." + i + ".material", "cps= " + meta.getOwner());
} else{
//return blank head
file.set("panels." + panelName + ".item." + i + ".material", plugin.getHeads.playerHeadString());
}
}
}
@ -448,7 +448,9 @@ public class ItemCreation {
//potion legacy PotionData or current PotionType
if(plugin.legacy.MAJOR_VERSION.lessThanOrEqualTo(MinecraftVersions.v1_19) ||
(plugin.legacy.MAJOR_VERSION == MinecraftVersions.v1_20 && plugin.legacy.MINOR_VERSION <= 4)){
file.set("panels." + panelName + ".item." + i + ".potion", plugin.legacyPotion.retrievePotionData(cont));
if(plugin.legacyPotion.retrievePotionData(cont) != null) {
file.set("panels." + panelName + ".item." + i + ".potion", plugin.legacyPotion.retrievePotionData(cont));
}
}else{
PotionMeta potionMeta = (PotionMeta) cont.getItemMeta();
assert potionMeta != null;

3
src/me/rockyhawk/commandpanels/ioclasses/potions/LegacyPotionData.java
View File

@ -2,7 +2,6 @@ package me.rockyhawk.commandpanels.ioclasses.potions;
import me.rockyhawk.commandpanels.CommandPanels;
import org.bukkit.ChatColor;
import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;
import org.bukkit.inventory.meta.PotionMeta;
@ -73,7 +72,7 @@ public class LegacyPotionData {
return potionType.name() + " " + extended + " " + level;
} catch (Exception e) {
plugin.debug(e, null);
return "Failed to retrieve potion data";
return null;
}
}
}