mirror of
https://github.com/HibiscusMC/HMCCosmetics.git
synced 2025-12-19 23:19:22 +00:00
Compare commits
81 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
fd50cd058a | ||
|
|
970ca8227b | ||
|
|
e7fd3ac288 | ||
|
|
51214964c4 | ||
|
|
4d4be789ae | ||
|
|
f2b276a2ef | ||
|
|
cf54f2b487 | ||
|
|
bae13c2e3c | ||
|
|
004f9ebef5 | ||
|
|
ad956259d0 | ||
|
|
65cebc3154 | ||
|
|
fb79293902 | ||
|
|
b49cebdec8 | ||
|
|
00cc3eef2c | ||
|
|
42bae598a6 | ||
|
|
b182e46b28 | ||
|
|
6b6b0e385e | ||
|
|
db60046701 | ||
|
|
300e2cffba | ||
|
|
d5983d8834 | ||
|
|
9e07f728e1 | ||
|
|
dcd38d86c5 | ||
|
|
d39110af6c | ||
|
|
0f6fa3db8a | ||
|
|
5aef04dee0 | ||
|
|
a096f6c684 | ||
|
|
89825659a6 | ||
|
|
6ba078dcc4 | ||
|
|
2e32b8d9d5 | ||
|
|
941f57af35 | ||
|
|
bdb52c0a32 | ||
|
|
a7170e09cf | ||
|
|
8456d6a7ae | ||
|
|
08b28bc254 | ||
|
|
c27a9ab2ad | ||
|
|
2bf618d8d3 | ||
|
|
6eb7c9243d | ||
|
|
c2b4fade42 | ||
|
|
382eed9982 | ||
|
|
498370cc8e | ||
|
|
fef5769e31 | ||
|
|
4aa1f9451d | ||
|
|
c7730429de | ||
|
|
73ccddf628 | ||
|
|
26b5472924 | ||
|
|
5ecfb08412 | ||
|
|
8b223228ce | ||
|
|
eb03acd959 | ||
|
|
8e5b3d098c | ||
|
|
a869120b62 | ||
|
|
614892500c | ||
|
|
872282f77a | ||
|
|
c0483bfefe | ||
|
|
aecd40ba5a | ||
|
|
c3db45cfc4 | ||
|
|
99bc0a0756 | ||
|
|
e9afd6deb8 | ||
|
|
0770ac456d | ||
|
|
327d602491 | ||
|
|
65f162c89c | ||
|
|
e96d1f505e | ||
|
|
2af1deb4c1 | ||
|
|
d740989a01 | ||
|
|
fdc0004b75 | ||
|
|
a1ac0a83e1 | ||
|
|
f51ac5969f | ||
|
|
3255f744a7 | ||
|
|
dfa5e85dcb | ||
|
|
e30451e972 | ||
|
|
500b8ca0ce | ||
|
|
c52718da58 | ||
|
|
1290750028 | ||
|
|
57d5e02275 | ||
|
|
645fd25b82 | ||
|
|
4b1c15f46f | ||
|
|
b96ae68f24 | ||
|
|
3e5f698dbd | ||
|
|
88632dce3f | ||
|
|
30f25b4a92 | ||
|
|
a385b341f7 | ||
|
|
ff4f2b6ede |
@@ -2,14 +2,13 @@ import net.minecrell.pluginyml.bukkit.BukkitPluginDescription
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
id("java")
|
id("java")
|
||||||
id("maven-publish")
|
|
||||||
id("com.github.johnrengelman.shadow") version "7.1.2"
|
id("com.github.johnrengelman.shadow") version "7.1.2"
|
||||||
id("xyz.jpenilla.run-paper") version "2.0.0"
|
id("xyz.jpenilla.run-paper") version "2.0.0"
|
||||||
id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
|
id("net.minecrell.plugin-yml.bukkit") version "0.5.2"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "com.hibiscusmc"
|
group = "com.hibiscusmc"
|
||||||
version = "2.1.0"
|
version = "2.2.0"
|
||||||
|
|
||||||
allprojects {
|
allprojects {
|
||||||
apply(plugin = "java")
|
apply(plugin = "java")
|
||||||
@@ -57,20 +56,27 @@ allprojects {
|
|||||||
|
|
||||||
// ParticleHelper
|
// ParticleHelper
|
||||||
maven("https://repo.bytecode.space/repository/maven-public/")
|
maven("https://repo.bytecode.space/repository/maven-public/")
|
||||||
|
|
||||||
|
// PlayerAnimator
|
||||||
|
maven("https://mvn.lumine.io/repository/maven/")
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
|
|
||||||
compileOnly("com.mojang:authlib:1.5.25")
|
compileOnly("com.mojang:authlib:1.5.25")
|
||||||
compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
|
compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
|
||||||
compileOnly("org.jetbrains:annotations:23.0.0")
|
compileOnly("org.jetbrains:annotations:23.0.0")
|
||||||
compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
|
compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
|
||||||
compileOnly("me.clip:placeholderapi:2.11.1")
|
compileOnly("me.clip:placeholderapi:2.11.1")
|
||||||
compileOnly("com.ticxo.modelengine:api:R3.0.1")
|
compileOnly("com.ticxo.modelengine:api:R3.0.1")
|
||||||
compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
|
compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
|
||||||
compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
|
compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
|
||||||
|
compileOnly("com.mineinabyss:idofront:0.12.111")
|
||||||
|
compileOnly("com.mineinabyss:geary-papermc-core:0.19.113")
|
||||||
|
compileOnly("com.mineinabyss:looty:0.8.67")
|
||||||
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
|
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
|
||||||
compileOnly("it.unimi.dsi:fastutil:8.5.11")
|
compileOnly("it.unimi.dsi:fastutil:8.5.11")
|
||||||
|
compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,6 +97,7 @@ dependencies {
|
|||||||
implementation("org.bstats:bstats-bukkit:3.0.0")
|
implementation("org.bstats:bstats-bukkit:3.0.0")
|
||||||
implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
|
implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
|
||||||
implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
|
implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
|
||||||
|
implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
|
||||||
}
|
}
|
||||||
|
|
||||||
tasks {
|
tasks {
|
||||||
@@ -128,7 +135,8 @@ tasks {
|
|||||||
relocate("com.zaxxer.hikaricp", "com.hisbiscusmc.hmccosmetics.hikaricp")
|
relocate("com.zaxxer.hikaricp", "com.hisbiscusmc.hmccosmetics.hikaricp")
|
||||||
relocate("com.j256.ormlite", "com.hisbiscusmc.hmccosmetics.ormlite")
|
relocate("com.j256.ormlite", "com.hisbiscusmc.hmccosmetics.ormlite")
|
||||||
relocate("com.jeff_media.updatechecker", "com.hisbiscusmc.hmccosmetics.updatechecker")
|
relocate("com.jeff_media.updatechecker", "com.hisbiscusmc.hmccosmetics.updatechecker")
|
||||||
relocate("com.woen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
|
relocate("com.owen1212055.particlehelper", "com.hisbiscusmc.hmccosmetics.particlehelper")
|
||||||
|
relocate("com.ticxo.playeranimator", "com.hisbiscusmc.hmccosmetics.playeranimator")
|
||||||
archiveFileName.set("HMCCosmeticsRemapped-${project.version}.jar")
|
archiveFileName.set("HMCCosmeticsRemapped-${project.version}.jar")
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
@@ -153,10 +161,10 @@ tasks {
|
|||||||
bukkit {
|
bukkit {
|
||||||
load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
|
load = BukkitPluginDescription.PluginLoadOrder.POSTWORLD
|
||||||
main = "com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin"
|
main = "com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin"
|
||||||
apiVersion = "1.16"
|
apiVersion = "1.17"
|
||||||
authors = listOf("LoJoSho")
|
authors = listOf("LoJoSho")
|
||||||
depend = listOf("ProtocolLib", "PlaceholderAPI")
|
depend = listOf("ProtocolLib")
|
||||||
softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "HMCColor", "WorldGuard", "MythicMobs")
|
softDepend = listOf("ModelEngine", "Oraxen", "ItemsAdder", "Looty", "HMCColor", "WorldGuard", "MythicMobs", "PlaceholderAPI", "SuperVanish", "PremiumVanish")
|
||||||
version = "${project.version}"
|
version = "${project.version}"
|
||||||
|
|
||||||
commands {
|
commands {
|
||||||
@@ -183,6 +191,15 @@ bukkit {
|
|||||||
register("hmccosmetics.cmd.menu") {
|
register("hmccosmetics.cmd.menu") {
|
||||||
default = BukkitPluginDescription.Permission.Default.TRUE
|
default = BukkitPluginDescription.Permission.Default.TRUE
|
||||||
}
|
}
|
||||||
|
register("hmccosmetics.emote.shiftrun") {
|
||||||
|
default = BukkitPluginDescription.Permission.Default.TRUE
|
||||||
|
}
|
||||||
|
register("hmccosmetics.cmd.emote") {
|
||||||
|
default = BukkitPluginDescription.Permission.Default.TRUE
|
||||||
|
}
|
||||||
|
register("hmccosmetics.cmd.emote.other") {
|
||||||
|
default = BukkitPluginDescription.Permission.Default.OP
|
||||||
|
}
|
||||||
register("hmccosmetics.cmd.setlocation") {
|
register("hmccosmetics.cmd.setlocation") {
|
||||||
default = BukkitPluginDescription.Permission.Default.OP
|
default = BukkitPluginDescription.Permission.Default.OP
|
||||||
}
|
}
|
||||||
@@ -228,17 +245,4 @@ bukkit {
|
|||||||
java {
|
java {
|
||||||
toolchain.languageVersion.set(JavaLanguageVersion.of(17
|
toolchain.languageVersion.set(JavaLanguageVersion.of(17
|
||||||
))
|
))
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
publishing {
|
|
||||||
publications {
|
|
||||||
create<MavenPublication>("maven") {
|
|
||||||
groupId = "${project.group}"
|
|
||||||
artifactId = "${project.name}"
|
|
||||||
version = "${project.version}"
|
|
||||||
|
|
||||||
from(components["java"])
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -1,33 +1,104 @@
|
|||||||
plugins {
|
plugins {
|
||||||
id("java")
|
id("java")
|
||||||
|
id("maven-publish")
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly("com.mojang:authlib:1.5.25")
|
compileOnly("com.mojang:authlib:1.5.25")
|
||||||
compileOnly("org.spigotmc:spigot-api:1.16.5-R0.1-SNAPSHOT")
|
compileOnly("org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT")
|
||||||
compileOnly("org.jetbrains:annotations:23.0.0")
|
compileOnly("org.jetbrains:annotations:23.0.0")
|
||||||
compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
|
compileOnly("com.comphenix.protocol:ProtocolLib:5.0.0-SNAPSHOT")
|
||||||
compileOnly("me.clip:placeholderapi:2.11.1")
|
compileOnly("me.clip:placeholderapi:2.11.1")
|
||||||
compileOnly("com.ticxo.modelengine:api:R3.0.1")
|
compileOnly("com.ticxo.modelengine:api:R3.0.1")
|
||||||
compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
|
compileOnly("com.github.oraxen:oraxen:-SNAPSHOT")
|
||||||
compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
|
compileOnly("com.github.LoneDev6:API-ItemsAdder:3.2.5")
|
||||||
|
compileOnly("com.mineinabyss:geary-papermc-core:0.19.113")
|
||||||
|
compileOnly("com.mineinabyss:looty:0.8.67")
|
||||||
compileOnly("com.hibiscus:hmccolor:0.3-SNAPSHOT")
|
compileOnly("com.hibiscus:hmccolor:0.3-SNAPSHOT")
|
||||||
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
|
compileOnly("com.sk89q.worldguard:worldguard-bukkit:7.1.0-SNAPSHOT")
|
||||||
compileOnly("it.unimi.dsi:fastutil:8.5.11")
|
compileOnly("it.unimi.dsi:fastutil:8.5.11")
|
||||||
compileOnly("io.lumine:Mythic-Dist:5.2.1")
|
compileOnly("io.lumine:Mythic-Dist:5.2.1")
|
||||||
|
compileOnly("com.github.LeonMangler:SuperVanish:6.2.6-4")
|
||||||
|
|
||||||
//compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
|
//compileOnly("com.github.Fisher2911:FisherLib:master-SNAPSHOT")
|
||||||
implementation("net.kyori:adventure-api:4.12.0")
|
implementation("net.kyori:adventure-api:4.12.0")
|
||||||
implementation ("net.kyori:adventure-text-minimessage:4.12.0")
|
implementation("net.kyori:adventure-text-minimessage:4.12.0")
|
||||||
implementation("net.kyori:adventure-platform-bukkit:4.2.0")
|
implementation("net.kyori:adventure-platform-bukkit:4.2.0")
|
||||||
implementation("dev.triumphteam:triumph-gui:3.1.3")
|
implementation("dev.triumphteam:triumph-gui:3.1.3")
|
||||||
implementation("org.spongepowered:configurate-yaml:4.1.2")
|
implementation("org.spongepowered:configurate-yaml:4.1.2")
|
||||||
implementation("org.bstats:bstats-bukkit:3.0.0")
|
implementation("org.bstats:bstats-bukkit:3.0.0")
|
||||||
implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
|
implementation("com.jeff_media:SpigotUpdateChecker:3.0.0")
|
||||||
implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
|
implementation("com.owen1212055:particlehelper:1.0.0-SNAPSHOT")
|
||||||
|
implementation("com.ticxo.playeranimator:PlayerAnimator:R1.2.5")
|
||||||
}
|
}
|
||||||
|
|
||||||
java {
|
java {
|
||||||
toolchain.languageVersion.set(JavaLanguageVersion.of(17
|
toolchain.languageVersion.set(JavaLanguageVersion.of(17
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
publishing {
|
||||||
|
val publishData = PublishData(project)
|
||||||
|
publications {
|
||||||
|
create<MavenPublication>("maven") {
|
||||||
|
groupId = "${rootProject.group}"
|
||||||
|
artifactId = "${rootProject.name}"
|
||||||
|
version = "${rootProject.version}"
|
||||||
|
|
||||||
|
from(components["java"])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
repositories {
|
||||||
|
maven {
|
||||||
|
authentication {
|
||||||
|
credentials(PasswordCredentials::class) {
|
||||||
|
username = System.getenv("REPO_USERNAME")
|
||||||
|
password = System.getenv("REPO_PASSWORD")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
name = "HibiscusMCRepository"
|
||||||
|
url = uri(publishData.getRepository())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class PublishData(private val project: Project) {
|
||||||
|
var type: Type = getReleaseType()
|
||||||
|
var hashLength: Int = 7
|
||||||
|
|
||||||
|
private fun getReleaseType(): Type {
|
||||||
|
val branch = getCheckedOutBranch()
|
||||||
|
return when {
|
||||||
|
branch.contentEquals("master") || branch.contentEquals("local") -> Type.RELEASE
|
||||||
|
branch.startsWith("dev") -> Type.DEV
|
||||||
|
else -> Type.SNAPSHOT
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getCheckedOutGitCommitHash(): String =
|
||||||
|
System.getenv("GITHUB_SHA")?.substring(0, hashLength) ?: "local"
|
||||||
|
|
||||||
|
private fun getCheckedOutBranch(): String =
|
||||||
|
System.getenv("GITHUB_REF")?.replace("refs/heads/", "") ?: "local"
|
||||||
|
|
||||||
|
fun getVersion(): String = getVersion(false)
|
||||||
|
|
||||||
|
fun getVersion(appendCommit: Boolean): String =
|
||||||
|
type.append(getVersionString(), appendCommit, getCheckedOutGitCommitHash())
|
||||||
|
|
||||||
|
private fun getVersionString(): String =
|
||||||
|
(rootProject.version as String).replace("-SNAPSHOT", "").replace("-DEV", "")
|
||||||
|
|
||||||
|
fun getRepository(): String = type.repo
|
||||||
|
|
||||||
|
enum class Type(private val append: String, val repo: String, private val addCommit: Boolean) {
|
||||||
|
RELEASE("", "https://repo.hibiscusmc.com/releases/", false),
|
||||||
|
DEV("-DEV", "https://repo.hibiscusmc.com/development/", true),
|
||||||
|
SNAPSHOT("-SNAPSHOT", "https://repo.hibiscusmc.com/snapshots/", true);
|
||||||
|
|
||||||
|
fun append(name: String, appendCommit: Boolean, commitHash: String): String =
|
||||||
|
name.plus(append).plus(if (appendCommit && addCommit) "-".plus(commitHash) else "")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -12,8 +12,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
||||||
import com.hibiscusmc.hmccosmetics.database.Database;
|
import com.hibiscusmc.hmccosmetics.database.Database;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
|
import com.hibiscusmc.hmccosmetics.hooks.Hooks;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.items.ItemHooks;
|
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook;
|
import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGHook;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
|
import com.hibiscusmc.hmccosmetics.hooks.worldguard.WGListener;
|
||||||
import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
|
import com.hibiscusmc.hmccosmetics.listener.PlayerConnectionListener;
|
||||||
@@ -23,6 +22,10 @@ import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
|||||||
import com.hibiscusmc.hmccosmetics.util.TranslationUtil;
|
import com.hibiscusmc.hmccosmetics.util.TranslationUtil;
|
||||||
import com.jeff_media.updatechecker.UpdateCheckSource;
|
import com.jeff_media.updatechecker.UpdateCheckSource;
|
||||||
import com.jeff_media.updatechecker.UpdateChecker;
|
import com.jeff_media.updatechecker.UpdateChecker;
|
||||||
|
import com.ticxo.playeranimator.PlayerAnimatorImpl;
|
||||||
|
import com.ticxo.playeranimator.api.PlayerAnimator;
|
||||||
|
import com.ticxo.playeranimator.api.animation.pack.AnimationPack;
|
||||||
|
import org.apache.commons.io.FilenameUtils;
|
||||||
import org.bstats.bukkit.Metrics;
|
import org.bstats.bukkit.Metrics;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
@@ -38,6 +41,9 @@ import org.spongepowered.configurate.yaml.YamlConfigurationLoader;
|
|||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.nio.file.Path;
|
import java.nio.file.Path;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
public final class HMCCosmeticsPlugin extends JavaPlugin {
|
public final class HMCCosmeticsPlugin extends JavaPlugin {
|
||||||
|
|
||||||
@@ -45,6 +51,9 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
private static boolean disable = false;
|
private static boolean disable = false;
|
||||||
private static YamlConfigurationLoader configLoader;
|
private static YamlConfigurationLoader configLoader;
|
||||||
private static final int pluginId = 13873;
|
private static final int pluginId = 13873;
|
||||||
|
private static boolean hasModelEngine = false;
|
||||||
|
private static boolean onLatestVersion = true;
|
||||||
|
private static String latestVersion = "";
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
@@ -61,11 +70,24 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Update Checker
|
// Update Checker
|
||||||
new UpdateChecker(this, UpdateCheckSource.POLYMART, "1879")
|
UpdateChecker checker = new UpdateChecker(this, UpdateCheckSource.POLYMART, "1879")
|
||||||
.setDownloadLink("https://polymart.org/resource/1879")
|
.onSuccess((commandSenders, latestVersion) -> {
|
||||||
|
this.latestVersion = (String) latestVersion;
|
||||||
|
if (!this.latestVersion.equalsIgnoreCase(getDescription().getVersion())) {
|
||||||
|
getLogger().info("+++++++++++++++++++++++++++++++++++");
|
||||||
|
getLogger().info("There is a new update for HMCCosmetics!");
|
||||||
|
getLogger().info("Please download it as soon as possible for possible fixes and new features.");
|
||||||
|
getLogger().info("Current Version " + getDescription().getVersion() + " | Latest Version " + latestVersion);
|
||||||
|
getLogger().info("Spigot: https://www.spigotmc.org/resources/100107/");
|
||||||
|
getLogger().info("Polymart: https://polymart.org/resource/1879");
|
||||||
|
getLogger().info("+++++++++++++++++++++++++++++++++++");
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.setNotifyRequesters(false)
|
||||||
|
.setNotifyOpsOnJoin(false)
|
||||||
.checkEveryXHours(24)
|
.checkEveryXHours(24)
|
||||||
.checkNow();
|
.checkNow();
|
||||||
|
onLatestVersion = checker.isUsingLatestVersion();
|
||||||
// File setup
|
// File setup
|
||||||
if (!getDataFolder().exists()) {
|
if (!getDataFolder().exists()) {
|
||||||
saveDefaultConfig();
|
saveDefaultConfig();
|
||||||
@@ -74,6 +96,12 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
saveResource("cosmetics/defaultcosmetics.yml", false);
|
saveResource("cosmetics/defaultcosmetics.yml", false);
|
||||||
saveResource("menus/defaultmenu.yml", false);
|
saveResource("menus/defaultmenu.yml", false);
|
||||||
}
|
}
|
||||||
|
// Emote folder setup
|
||||||
|
File emoteFile = new File(getDataFolder().getPath() + "/emotes");
|
||||||
|
if (!emoteFile.exists()) emoteFile.mkdir();
|
||||||
|
|
||||||
|
// Player Animator
|
||||||
|
PlayerAnimatorImpl.initialize(this);
|
||||||
|
|
||||||
setup();
|
setup();
|
||||||
|
|
||||||
@@ -88,10 +116,12 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
// Database
|
// Database
|
||||||
new Database();
|
new Database();
|
||||||
|
|
||||||
// PAPI
|
// ModelEngine
|
||||||
if (Bukkit.getPluginManager().getPlugin("PlaceholderAPI") != null) {
|
if (Bukkit.getPluginManager().getPlugin("ModelEngine") != null) {
|
||||||
new PAPIHook().register();
|
hasModelEngine = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// WorldGuard
|
||||||
if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) {
|
if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) {
|
||||||
getServer().getPluginManager().registerEvents(new WGListener(), this);
|
getServer().getPluginManager().registerEvents(new WGListener(), this);
|
||||||
}
|
}
|
||||||
@@ -173,8 +203,8 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
|
|
||||||
// ItemHooks
|
// Misc Hooks setup (like items)
|
||||||
ItemHooks.setup();
|
Hooks.setup();
|
||||||
|
|
||||||
// Cosmetics setup
|
// Cosmetics setup
|
||||||
Cosmetics.setup();
|
Cosmetics.setup();
|
||||||
@@ -205,6 +235,22 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
File emoteFolder = new File(getInstance().getDataFolder().getPath() + "/emotes/");
|
||||||
|
if (emoteFolder.exists()) {
|
||||||
|
PlayerAnimator.api.getAnimationManager().clearRegistry();
|
||||||
|
File[] emotesFiles = emoteFolder.listFiles();
|
||||||
|
for (File emoteFile : emotesFiles) {
|
||||||
|
if (!emoteFile.getName().contains("bbmodel")) continue;
|
||||||
|
String animationName = emoteFile.getName().replaceAll(".bbmodel", "");
|
||||||
|
PlayerAnimator.api.getAnimationManager().importAnimations(FilenameUtils.removeExtension(emoteFile.getName()), emoteFile);
|
||||||
|
MessagesUtil.sendDebugMessages("Added '" + animationName + "' to Player Animator ");
|
||||||
|
}
|
||||||
|
|
||||||
|
for (Map.Entry<String, AnimationPack> packEntry : PlayerAnimator.api.getAnimationManager().getRegistry().entrySet()) {
|
||||||
|
//Set<String> animationNames = packEntry.getValue().getAnimations().keySet().stream().map(animation -> packEntry.getKey().replace(":", ".") + "." + animation).collect(Collectors.toSet());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
getInstance().getLogger().info("Successfully Enabled HMCCosmetics");
|
getInstance().getLogger().info("Successfully Enabled HMCCosmetics");
|
||||||
getInstance().getLogger().info(Cosmetics.values().size() + " Cosmetics Successfully Setup");
|
getInstance().getLogger().info(Cosmetics.values().size() + " Cosmetics Successfully Setup");
|
||||||
getInstance().getLogger().info(Menus.getMenuNames().size() + " Menus Successfully Setup");
|
getInstance().getLogger().info(Menus.getMenuNames().size() + " Menus Successfully Setup");
|
||||||
@@ -229,4 +275,14 @@ public final class HMCCosmeticsPlugin extends JavaPlugin {
|
|||||||
throw new RuntimeException(e);
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static boolean hasModelEngine() {
|
||||||
|
return hasModelEngine;
|
||||||
|
}
|
||||||
|
public static boolean isOnLatestVersion() {
|
||||||
|
return onLatestVersion;
|
||||||
|
}
|
||||||
|
public static String getLatestVersion() {
|
||||||
|
return latestVersion;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
|
||||||
import com.hibiscusmc.hmccosmetics.database.Database;
|
import com.hibiscusmc.hmccosmetics.database.Database;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.Menu;
|
import com.hibiscusmc.hmccosmetics.gui.Menu;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
||||||
@@ -33,6 +34,8 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {
|
||||||
|
boolean silent = false;
|
||||||
|
|
||||||
if (args.length == 0) {
|
if (args.length == 0) {
|
||||||
if (!(sender instanceof Player)) {
|
if (!(sender instanceof Player)) {
|
||||||
// Console
|
// Console
|
||||||
@@ -44,7 +47,7 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId());
|
CosmeticUser user = CosmeticUsers.getUser(((Player) sender).getUniqueId());
|
||||||
Menu menu = Menus.getMenu(Settings.getDefaultMenu());
|
Menu menu = Menus.getDefaultMenu();
|
||||||
|
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
@@ -62,49 +65,61 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
Player player = sender instanceof Player ? (Player) sender : null;
|
Player player = sender instanceof Player ? (Player) sender : null;
|
||||||
|
|
||||||
String firstArgs = args[0].toLowerCase();
|
String firstArgs = args[0].toLowerCase();
|
||||||
|
|
||||||
|
if (sender.hasPermission("HMCCosmetics.cmd.silent") || sender.isOp()) {
|
||||||
|
for (String singleArg : args) {
|
||||||
|
if (singleArg.equalsIgnoreCase("-s")) silent = true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
switch (firstArgs) {
|
switch (firstArgs) {
|
||||||
case ("reload") -> {
|
case ("reload") -> {
|
||||||
if (!sender.hasPermission("HMCCosmetics.cmd.reload") || !sender.isOp()) {
|
if (!sender.hasPermission("HMCCosmetics.cmd.reload") && !sender.isOp()) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
HMCCosmeticsPlugin.setup();
|
HMCCosmeticsPlugin.setup();
|
||||||
MessagesUtil.sendMessage(sender, "reloaded");
|
if (!silent) MessagesUtil.sendMessage(sender, "reloaded");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case ("apply") -> {
|
case ("apply") -> {
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.apply")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.apply")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Cosmetic cosmetic;
|
Cosmetic cosmetic;
|
||||||
|
Color color = Color.WHITE;
|
||||||
|
|
||||||
if (sender instanceof Player) player = ((Player) sender).getPlayer();
|
if (sender instanceof Player) player = ((Player) sender).getPlayer();
|
||||||
if (sender.hasPermission("hmccosmetics.cmd.apply.other")) {
|
if (sender.hasPermission("hmccosmetics.cmd.apply.other")) {
|
||||||
if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
|
if (args.length >= 3) player = Bukkit.getPlayer(args[2]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (sender.hasPermission("hmccosmetics.cmd.apply.color")) {
|
||||||
|
if (args.length >= 4) color = ServerUtils.hex2Rgb(args[3]);
|
||||||
|
}
|
||||||
|
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
MessagesUtil.sendMessage(player, "not-enough-args");
|
if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
cosmetic = Cosmetics.getCosmetic(args[1]);
|
cosmetic = Cosmetics.getCosmetic(args[1]);
|
||||||
|
|
||||||
if (cosmetic == null) {
|
if (cosmetic == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-cosmetic");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-cosmetic");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
|
||||||
if (!user.canEquipCosmetic(cosmetic)) {
|
if (!user.canEquipCosmetic(cosmetic)) {
|
||||||
MessagesUtil.sendMessage(player, "no-cosmetic-permission");
|
if (!silent) MessagesUtil.sendMessage(player, "no-cosmetic-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -113,19 +128,19 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
TagResolver.resolver(Placeholder.parsed("player", player.getName())),
|
TagResolver.resolver(Placeholder.parsed("player", player.getName())),
|
||||||
TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmetic.getSlot().name())));
|
TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmetic.getSlot().name())));
|
||||||
|
|
||||||
MessagesUtil.sendMessage(player, "equip-cosmetic", placeholders);
|
if (!silent) MessagesUtil.sendMessage(player, "equip-cosmetic", placeholders);
|
||||||
|
|
||||||
user.addPlayerCosmetic(cosmetic);
|
user.addPlayerCosmetic(cosmetic, color);
|
||||||
user.updateCosmetic(cosmetic.getSlot());
|
user.updateCosmetic(cosmetic.getSlot());
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case ("unapply") -> {
|
case ("unapply") -> {
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.unapply")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.unapply")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
MessagesUtil.sendMessage(player, "not-enough-args");
|
if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -137,20 +152,20 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1].toUpperCase())) {
|
if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1].toUpperCase())) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-slot");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-slot");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
cosmeticSlot = CosmeticSlot.valueOf(args[1].toUpperCase());
|
cosmeticSlot = CosmeticSlot.valueOf(args[1].toUpperCase());
|
||||||
|
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
|
||||||
if (user.getCosmetic(cosmeticSlot) == null) {
|
if (user.getCosmetic(cosmeticSlot) == null) {
|
||||||
MessagesUtil.sendMessage(sender, "no-cosmetic-slot");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-cosmetic-slot");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -159,7 +174,7 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
TagResolver.resolver(Placeholder.parsed("player", player.getName())),
|
TagResolver.resolver(Placeholder.parsed("player", player.getName())),
|
||||||
TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmeticSlot.name())));
|
TagResolver.resolver(Placeholder.parsed("cosmeticslot", cosmeticSlot.name())));
|
||||||
|
|
||||||
MessagesUtil.sendMessage(player, "unequip-cosmetic", placeholders);
|
if (!silent) MessagesUtil.sendMessage(player, "unequip-cosmetic", placeholders);
|
||||||
|
|
||||||
user.removeCosmeticSlot(cosmeticSlot);
|
user.removeCosmeticSlot(cosmeticSlot);
|
||||||
user.updateCosmetic(cosmeticSlot);
|
user.updateCosmetic(cosmeticSlot);
|
||||||
@@ -172,12 +187,12 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.wardrobe")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.wardrobe")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -190,7 +205,7 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
case ("menu") -> {
|
case ("menu") -> {
|
||||||
if (args.length == 1) return true;
|
if (args.length == 1) return true;
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.menu")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.menu")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Menu menu = Menus.getMenu(args[1]);
|
Menu menu = Menus.getMenu(args[1]);
|
||||||
@@ -202,12 +217,12 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
|
||||||
if (user == null) {
|
if (user == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (menu == null) {
|
if (menu == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-menu");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-menu");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -219,7 +234,7 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
OfflinePlayer selectedPlayer = Bukkit.getOfflinePlayer(args[1]);
|
OfflinePlayer selectedPlayer = Bukkit.getOfflinePlayer(args[1]);
|
||||||
if (selectedPlayer == null) return true;
|
if (selectedPlayer == null) return true;
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.dataclear") && !sender.isOp()) {
|
if (!sender.hasPermission("hmccosmetics.cmd.dataclear") && !sender.isOp()) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Database.clearData(selectedPlayer.getUniqueId());
|
Database.clearData(selectedPlayer.getUniqueId());
|
||||||
@@ -231,30 +246,30 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
if (user == null) return true;
|
if (user == null) return true;
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.dye") && !sender.isOp()) {
|
if (!sender.hasPermission("hmccosmetics.cmd.dye") && !sender.isOp()) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.length == 1) {
|
if (args.length == 1) {
|
||||||
MessagesUtil.sendMessage(player, "not-enough-args");
|
if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1])) {
|
if (!EnumUtils.isValidEnum(CosmeticSlot.class, args[1])) {
|
||||||
MessagesUtil.sendMessage(player, "invalid-slot");
|
if (!silent) MessagesUtil.sendMessage(player, "invalid-slot");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
CosmeticSlot slot = CosmeticSlot.valueOf(args[1]);
|
CosmeticSlot slot = CosmeticSlot.valueOf(args[1]);
|
||||||
Cosmetic cosmetic = user.getCosmetic(slot);
|
Cosmetic cosmetic = user.getCosmetic(slot);
|
||||||
|
|
||||||
if (args.length >= 3) {
|
if (args.length >= 3) {
|
||||||
if (!args[2].contains("#") || args[2].isEmpty()) {
|
if (args[2].isEmpty()) {
|
||||||
MessagesUtil.sendMessage(player, "invalid-color");
|
if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
Color color = ServerUtils.hex2Rgb(args[2]);
|
Color color = ServerUtils.hex2Rgb(args[2]);
|
||||||
if (color == null) {
|
if (color == null) {
|
||||||
MessagesUtil.sendMessage(player, "invalid-color");
|
if (!silent) MessagesUtil.sendMessage(player, "invalid-color");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
user.addPlayerCosmetic(cosmetic, color); // #FFFFFF
|
user.addPlayerCosmetic(cosmetic, color); // #FFFFFF
|
||||||
@@ -264,32 +279,32 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
case ("setlocation") -> {
|
case ("setlocation") -> {
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.setlocation")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.setlocation")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player == null) return true;
|
if (player == null) return true;
|
||||||
|
|
||||||
if (args.length < 2) {
|
if (args.length < 2) {
|
||||||
MessagesUtil.sendMessage(player, "not-enough-args");
|
if (!silent) MessagesUtil.sendMessage(player, "not-enough-args");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args[1].equalsIgnoreCase("wardrobelocation")) {
|
if (args[1].equalsIgnoreCase("wardrobelocation")) {
|
||||||
WardrobeSettings.setWardrobeLocation(player.getLocation());
|
WardrobeSettings.setWardrobeLocation(player.getLocation());
|
||||||
MessagesUtil.sendMessage(player, "set-wardrobe-location");
|
if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-location");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args[1].equalsIgnoreCase("viewerlocation")) {
|
if (args[1].equalsIgnoreCase("viewerlocation")) {
|
||||||
WardrobeSettings.setViewerLocation(player.getLocation());
|
WardrobeSettings.setViewerLocation(player.getLocation());
|
||||||
MessagesUtil.sendMessage(player, "set-wardrobe-viewing");
|
if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-viewing");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args[1].equalsIgnoreCase("leavelocation")) {
|
if (args[1].equalsIgnoreCase("leavelocation")) {
|
||||||
WardrobeSettings.setLeaveLocation(player.getLocation());
|
WardrobeSettings.setLeaveLocation(player.getLocation());
|
||||||
MessagesUtil.sendMessage(player, "set-wardrobe-leaving");
|
if (!silent) MessagesUtil.sendMessage(player, "set-wardrobe-leaving");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -298,12 +313,12 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
if (user == null) return true;
|
if (user == null) return true;
|
||||||
if (!sender.hasPermission("HMCCosmetic.cmd.dump") && !sender.isOp()) {
|
if (!sender.hasPermission("HMCCosmetic.cmd.dump") && !sender.isOp()) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
player.sendMessage("Passengers -> " + player.getPassengers());
|
player.sendMessage("Passengers -> " + player.getPassengers());
|
||||||
if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
||||||
player.sendMessage("Backpack Location -> " + user.getBackpackEntity().getLocation());
|
player.sendMessage("Backpack Location -> " + user.getUserBackpackManager().getArmorstand().getLocation());
|
||||||
}
|
}
|
||||||
player.sendMessage("Cosmetics -> " + user.getCosmetic());
|
player.sendMessage("Cosmetics -> " + user.getCosmetic());
|
||||||
player.sendMessage("EntityId -> " + player.getEntityId());
|
player.sendMessage("EntityId -> " + player.getEntityId());
|
||||||
@@ -316,18 +331,18 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.hide")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.hide")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
MessagesUtil.sendMessage(sender, "hide-cosmetic");
|
if (!silent) MessagesUtil.sendMessage(sender, "hide-cosmetic");
|
||||||
user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
|
user.hideCosmetics(CosmeticUser.HiddenReason.COMMAND);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case ("show") -> {
|
case ("show") -> {
|
||||||
@@ -337,36 +352,53 @@ public class CosmeticCommand implements CommandExecutor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.show")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.show")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player == null) {
|
if (player == null) {
|
||||||
MessagesUtil.sendMessage(sender, "invalid-player");
|
if (!silent) MessagesUtil.sendMessage(sender, "invalid-player");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
|
||||||
MessagesUtil.sendMessage(sender, "show-cosmetic");
|
if (!silent) MessagesUtil.sendMessage(sender, "show-cosmetic");
|
||||||
user.showCosmetics();
|
user.showCosmetics();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
case ("debug") -> {
|
case ("debug") -> {
|
||||||
if (!sender.hasPermission("hmccosmetics.cmd.debug")) {
|
if (!sender.hasPermission("hmccosmetics.cmd.debug")) {
|
||||||
MessagesUtil.sendMessage(sender, "no-permission");
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (Settings.getDebugMode()) {
|
if (Settings.getDebugMode()) {
|
||||||
Settings.setDebugMode(false);
|
Settings.setDebugMode(false);
|
||||||
MessagesUtil.sendMessage(sender, "debug-disabled");
|
if (!silent) MessagesUtil.sendMessage(sender, "debug-disabled");
|
||||||
} else {
|
} else {
|
||||||
Settings.setDebugMode(true);
|
Settings.setDebugMode(true);
|
||||||
MessagesUtil.sendMessage(sender, "debug-enabled");
|
if (!silent) MessagesUtil.sendMessage(sender, "debug-enabled");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
case ("emote") -> {
|
||||||
|
if (!sender.hasPermission("hmccosmetics.cmd.emote")) {
|
||||||
|
if (!silent) MessagesUtil.sendMessage(sender, "no-permission");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
if (sender.hasPermission("hmccosmetics.cmd.emote.other")) {
|
||||||
|
if (args.length >= 2) player = Bukkit.getPlayer(args[1]);
|
||||||
|
}
|
||||||
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
if (!user.hasCosmeticInSlot(CosmeticSlot.EMOTE)) {
|
||||||
|
if (!silent) MessagesUtil.sendMessage(sender, "emote-none");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
CosmeticEmoteType cosmeticEmoteType = (CosmeticEmoteType) user.getCosmetic(CosmeticSlot.EMOTE);
|
||||||
|
cosmeticEmoteType.run(user);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import com.hibiscusmc.hmccosmetics.gui.Menu;
|
|||||||
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
|
||||||
|
import com.ticxo.playeranimator.api.PlayerAnimator;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.command.Command;
|
import org.bukkit.command.Command;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
@@ -39,6 +40,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
|
|||||||
if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide");
|
if (hasPermission(sender, "hmccosmetics.cmd.hide")) completions.add("hide");
|
||||||
if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
|
if (hasPermission(sender, "hmccosmetics.cmd.show")) completions.add("show");
|
||||||
if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
|
if (hasPermission(sender, "hmccosmetics.cmd.debug")) completions.add("debug");
|
||||||
|
if (hasPermission(sender, "hmccosmetics.cmd.emote")) completions.add("emote");
|
||||||
|
|
||||||
StringUtil.copyPartialMatches(args[0], completions, finalCompletitons);
|
StringUtil.copyPartialMatches(args[0], completions, finalCompletitons);
|
||||||
}
|
}
|
||||||
@@ -62,7 +64,7 @@ public class CosmeticCommandTabComplete implements TabCompleter {
|
|||||||
if (menu.canOpen(user.getPlayer())) completions.add(menu.getId());
|
if (menu.canOpen(user.getPlayer())) completions.add(menu.getId());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
case "dataclear", "wardrobe", "hide", "show" -> {
|
case "dataclear", "wardrobe", "hide", "show", "emote" -> {
|
||||||
for (Player player : Bukkit.getOnlinePlayers()) {
|
for (Player player : Bukkit.getOnlinePlayers()) {
|
||||||
completions.add(player.getName());
|
completions.add(player.getName());
|
||||||
}
|
}
|
||||||
@@ -91,11 +93,20 @@ public class CosmeticCommandTabComplete implements TabCompleter {
|
|||||||
completions.add(player.getName());
|
completions.add(player.getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
StringUtil.copyPartialMatches(args[2], completions, finalCompletitons);
|
StringUtil.copyPartialMatches(args[2], completions, finalCompletitons);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (args.length == 4) {
|
||||||
|
String subcommand = args[0].toLowerCase();
|
||||||
|
switch (subcommand) {
|
||||||
|
case "apply" -> {
|
||||||
|
completions.add("#FFFFFF");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
StringUtil.copyPartialMatches(args[3], completions, finalCompletitons);
|
||||||
|
}
|
||||||
|
|
||||||
Collections.sort(finalCompletitons);
|
Collections.sort(finalCompletitons);
|
||||||
return finalCompletitons;
|
return finalCompletitons;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -28,6 +28,8 @@ public class Settings {
|
|||||||
private static final String DEBUG_ENABLE_PETH = "debug-mode";
|
private static final String DEBUG_ENABLE_PETH = "debug-mode";
|
||||||
private static final String TICK_PERIOD_PATH = "tick-period";
|
private static final String TICK_PERIOD_PATH = "tick-period";
|
||||||
private static final String UNAPPLY_DEATH_PATH = "unapply-on-death";
|
private static final String UNAPPLY_DEATH_PATH = "unapply-on-death";
|
||||||
|
private static final String FORCE_PERMISSION_JOIN_PATH = "force-permission-join";
|
||||||
|
private static final String EMOTE_DISTANCE_PATH = "emote-distance";
|
||||||
|
|
||||||
private static String defaultMenu;
|
private static String defaultMenu;
|
||||||
private static String dyeMenuName;
|
private static String dyeMenuName;
|
||||||
@@ -39,9 +41,11 @@ public class Settings {
|
|||||||
private static boolean requireEmptyBoots;
|
private static boolean requireEmptyBoots;
|
||||||
private static boolean debugMode;
|
private static boolean debugMode;
|
||||||
private static boolean unapplyOnDeath;
|
private static boolean unapplyOnDeath;
|
||||||
|
private static boolean forcePermissionJoin;
|
||||||
private static int lookDownPitch;
|
private static int lookDownPitch;
|
||||||
private static int viewDistance;
|
private static int viewDistance;
|
||||||
private static int tickPeriod;
|
private static int tickPeriod;
|
||||||
|
private static double emoteDistance;
|
||||||
private static Vector balloonOffset;
|
private static Vector balloonOffset;
|
||||||
|
|
||||||
public static void load(ConfigurationNode source) {
|
public static void load(ConfigurationNode source) {
|
||||||
@@ -67,6 +71,8 @@ public class Settings {
|
|||||||
requireEmptyPants = cosmeticSettings.node(REQUIRE_EMPTY_PANTS_PATH).getBoolean();
|
requireEmptyPants = cosmeticSettings.node(REQUIRE_EMPTY_PANTS_PATH).getBoolean();
|
||||||
requireEmptyBoots = cosmeticSettings.node(REQUIRE_EMPTY_BOOTS_PATH).getBoolean();
|
requireEmptyBoots = cosmeticSettings.node(REQUIRE_EMPTY_BOOTS_PATH).getBoolean();
|
||||||
unapplyOnDeath = cosmeticSettings.node(UNAPPLY_DEATH_PATH).getBoolean(false);
|
unapplyOnDeath = cosmeticSettings.node(UNAPPLY_DEATH_PATH).getBoolean(false);
|
||||||
|
forcePermissionJoin = cosmeticSettings.node(FORCE_PERMISSION_JOIN_PATH).getBoolean(false);
|
||||||
|
emoteDistance = cosmeticSettings.node(EMOTE_DISTANCE_PATH).getDouble(-3);
|
||||||
|
|
||||||
tickPeriod = cosmeticSettings.node(TICK_PERIOD_PATH).getInt(-1);
|
tickPeriod = cosmeticSettings.node(TICK_PERIOD_PATH).getInt(-1);
|
||||||
lookDownPitch = cosmeticSettings.node(LOOK_DOWN_PITCH_PATH).getInt();
|
lookDownPitch = cosmeticSettings.node(LOOK_DOWN_PITCH_PATH).getInt();
|
||||||
@@ -183,10 +189,17 @@ public class Settings {
|
|||||||
public static boolean getUnapplyOnDeath() {
|
public static boolean getUnapplyOnDeath() {
|
||||||
return unapplyOnDeath;
|
return unapplyOnDeath;
|
||||||
}
|
}
|
||||||
|
public static boolean getForcePermissionJoin() {
|
||||||
|
return forcePermissionJoin;
|
||||||
|
}
|
||||||
|
|
||||||
public static boolean getDebugMode() {
|
public static boolean getDebugMode() {
|
||||||
return debugMode;
|
return debugMode;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static double getEmoteDistance() {
|
||||||
|
return emoteDistance;
|
||||||
|
}
|
||||||
public static void setDebugMode(boolean newSetting) {
|
public static void setDebugMode(boolean newSetting) {
|
||||||
debugMode = newSetting;
|
debugMode = newSetting;
|
||||||
|
|
||||||
|
|||||||
@@ -1,10 +1,13 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.config.serializer;
|
package com.hibiscusmc.hmccosmetics.config.serializer;
|
||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.items.ItemHooks;
|
import com.hibiscusmc.hmccosmetics.hooks.Hooks;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.ServerUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.builder.ColorBuilder;
|
import com.hibiscusmc.hmccosmetics.util.builder.ColorBuilder;
|
||||||
import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
|
import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.misc.Utils;
|
import com.hibiscusmc.hmccosmetics.util.misc.Utils;
|
||||||
|
import org.apache.commons.lang3.EnumUtils;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Color;
|
import org.bukkit.Color;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@@ -71,7 +74,7 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
|
|||||||
|
|
||||||
String material = materialNode.getString();
|
String material = materialNode.getString();
|
||||||
|
|
||||||
ItemStack item = ItemHooks.getItem(material);
|
ItemStack item = Hooks.getItem(material);
|
||||||
if (item == null) {
|
if (item == null) {
|
||||||
HMCCosmeticsPlugin.getInstance().getLogger().severe("Invalid Material -> " + material);
|
HMCCosmeticsPlugin.getInstance().getLogger().severe("Invalid Material -> " + material);
|
||||||
return new ItemStack(Material.AIR);
|
return new ItemStack(Material.AIR);
|
||||||
@@ -80,15 +83,16 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
|
|||||||
|
|
||||||
ItemMeta itemMeta = item.getItemMeta();
|
ItemMeta itemMeta = item.getItemMeta();
|
||||||
if (itemMeta == null) return item;
|
if (itemMeta == null) return item;
|
||||||
if (!nameNode.virtual()) itemMeta.setDisplayName(StringUtils.parseStringToString(Utils.replaceIfNull(nameNode.getString(), "")));
|
if (!nameNode.virtual())
|
||||||
|
itemMeta.setDisplayName(StringUtils.parseStringToString(Utils.replaceIfNull(nameNode.getString(), "")));
|
||||||
if (!unbreakableNode.virtual()) itemMeta.setUnbreakable(unbreakableNode.getBoolean());
|
if (!unbreakableNode.virtual()) itemMeta.setUnbreakable(unbreakableNode.getBoolean());
|
||||||
if (!glowingNode.virtual()) {
|
if (!glowingNode.virtual()) {
|
||||||
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
|
itemMeta.addItemFlags(ItemFlag.HIDE_ENCHANTS);
|
||||||
itemMeta.addEnchant(Enchantment.LUCK, 1, true);
|
itemMeta.addEnchant(Enchantment.LUCK, 1, true);
|
||||||
}
|
}
|
||||||
if (!loreNode.virtual()) itemMeta.setLore(Utils.replaceIfNull(loreNode.getList(String.class),
|
if (!loreNode.virtual()) itemMeta.setLore(Utils.replaceIfNull(loreNode.getList(String.class),
|
||||||
new ArrayList<String>()).
|
new ArrayList<String>()).
|
||||||
stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
|
stream().map(StringUtils::parseStringToString).collect(Collectors.toList()));
|
||||||
if (!modelDataNode.virtual()) itemMeta.setCustomModelData(modelDataNode.getInt());
|
if (!modelDataNode.virtual()) itemMeta.setCustomModelData(modelDataNode.getInt());
|
||||||
|
|
||||||
if (!nbtNode.virtual()) {
|
if (!nbtNode.virtual()) {
|
||||||
@@ -104,11 +108,16 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!itemFlagsNode.virtual()) {
|
try {
|
||||||
for (ConfigurationNode flagNode : itemFlagsNode.childrenMap().values()) {
|
if (!itemFlagsNode.virtual()) {
|
||||||
if (ItemFlag.valueOf(flagNode.key().toString()) == null) continue;
|
for (String itemFlag : itemFlagsNode.getList(String.class)) {
|
||||||
itemMeta.addItemFlags(ItemFlag.valueOf(flagNode.key().toString()));
|
if (!EnumUtils.isValidEnum(ItemFlag.class, itemFlag)) continue;
|
||||||
|
MessagesUtil.sendDebugMessages("Added " + itemFlag + " to the item!");
|
||||||
|
itemMeta.addItemFlags(ItemFlag.valueOf(itemFlag));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.getType() == Material.PLAYER_HEAD) {
|
if (item.getType() == Material.PLAYER_HEAD) {
|
||||||
@@ -126,7 +135,11 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
|
|||||||
|
|
||||||
if (!colorNode.virtual()) {
|
if (!colorNode.virtual()) {
|
||||||
if (ColorBuilder.canBeColored(item.getType())) {
|
if (ColorBuilder.canBeColored(item.getType())) {
|
||||||
itemMeta = ColorBuilder.color(itemMeta, Color.fromRGB(redNode.getInt(0), greenNode.getInt(0), blueNode.getInt(0)));
|
if (!redNode.virtual()) {
|
||||||
|
itemMeta = ColorBuilder.color(itemMeta, Color.fromRGB(redNode.getInt(0), greenNode.getInt(0), blueNode.getInt(0)));
|
||||||
|
} else {
|
||||||
|
itemMeta = ColorBuilder.color(itemMeta, ServerUtils.hex2Rgb(colorNode.getString("#FFFFFF")));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,7 +149,6 @@ public class ItemSerializer implements TypeSerializer<ItemStack> {
|
|||||||
item.setItemMeta(itemMeta);
|
item.setItemMeta(itemMeta);
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void serialize(final Type type, @Nullable final ItemStack obj, final ConfigurationNode node) throws SerializationException {
|
public void serialize(final Type type, @Nullable final ItemStack obj, final ConfigurationNode node) throws SerializationException {
|
||||||
|
|
||||||
|
|||||||
@@ -8,5 +8,6 @@ public enum CosmeticSlot {
|
|||||||
MAINHAND,
|
MAINHAND,
|
||||||
OFFHAND,
|
OFFHAND,
|
||||||
BACKPACK,
|
BACKPACK,
|
||||||
BALLOON
|
BALLOON,
|
||||||
|
EMOTE
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3,10 +3,7 @@ package com.hibiscusmc.hmccosmetics.cosmetic;
|
|||||||
import com.google.common.collect.HashBiMap;
|
import com.google.common.collect.HashBiMap;
|
||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
import com.hibiscusmc.hmccosmetics.config.Settings;
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
import org.apache.commons.lang3.EnumUtils;
|
import org.apache.commons.lang3.EnumUtils;
|
||||||
import org.spongepowered.configurate.CommentedConfigurationNode;
|
import org.spongepowered.configurate.CommentedConfigurationNode;
|
||||||
@@ -97,6 +94,7 @@ public class Cosmetics {
|
|||||||
case BALLOON -> new CosmeticBalloonType(id, cosmeticConfig);
|
case BALLOON -> new CosmeticBalloonType(id, cosmeticConfig);
|
||||||
case BACKPACK -> new CosmeticBackpackType(id, cosmeticConfig);
|
case BACKPACK -> new CosmeticBackpackType(id, cosmeticConfig);
|
||||||
case MAINHAND -> new CosmeticMainhandType(id, cosmeticConfig);
|
case MAINHAND -> new CosmeticMainhandType(id, cosmeticConfig);
|
||||||
|
case EMOTE -> new CosmeticEmoteType(id, cosmeticConfig);
|
||||||
default -> new CosmeticArmorType(id, cosmeticConfig);
|
default -> new CosmeticArmorType(id, cosmeticConfig);
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
|
|||||||
@@ -25,15 +25,15 @@ public class CosmeticBackpackType extends Cosmetic {
|
|||||||
|
|
||||||
if (user.isInWardrobe()) return;
|
if (user.isInWardrobe()) return;
|
||||||
|
|
||||||
if (loc.getWorld() != user.getBackpackEntity().getWorld()) {
|
if (loc.getWorld() != user.getUserBackpackManager().getArmorstand().getWorld()) {
|
||||||
user.getBackpackEntity().teleport(loc);
|
user.getUserBackpackManager().getArmorstand().teleport(loc);
|
||||||
}
|
}
|
||||||
|
|
||||||
user.getBackpackEntity().teleport(loc);
|
user.getUserBackpackManager().getArmorstand().teleport(loc);
|
||||||
|
|
||||||
PacketManager.sendRidingPacket(player.getEntityId(), user.getBackpackEntity().getEntityId(), loc);
|
PacketManager.sendRidingPacket(player.getEntityId(), user.getUserBackpackManager().getFirstArmorstandId(), loc);
|
||||||
|
|
||||||
user.getBackpackEntity().setRotation(loc.getYaw(), loc.getPitch());
|
user.getUserBackpackManager().getArmorstand().setRotation(loc.getYaw(), loc.getPitch());
|
||||||
user.showBackpack();
|
user.getUserBackpackManager().showBackpack();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,10 +2,9 @@ package com.hibiscusmc.hmccosmetics.cosmetic.types;
|
|||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.config.Settings;
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
||||||
import org.apache.commons.lang3.EnumUtils;
|
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
@@ -13,7 +12,6 @@ import org.bukkit.util.Vector;
|
|||||||
import org.spongepowered.configurate.ConfigurationNode;
|
import org.spongepowered.configurate.ConfigurationNode;
|
||||||
import org.spongepowered.configurate.serialize.SerializationException;
|
import org.spongepowered.configurate.serialize.SerializationException;
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class CosmeticBalloonType extends Cosmetic {
|
public class CosmeticBalloonType extends Cosmetic {
|
||||||
@@ -50,28 +48,28 @@ public class CosmeticBalloonType extends Cosmetic {
|
|||||||
@Override
|
@Override
|
||||||
public void update(CosmeticUser user) {
|
public void update(CosmeticUser user) {
|
||||||
Player player = Bukkit.getPlayer(user.getUniqueId());
|
Player player = Bukkit.getPlayer(user.getUniqueId());
|
||||||
Location currentLocation = user.getBalloonEntity().getLocation().clone();
|
UserBalloonManager userBalloonManager = user.getBalloonManager();
|
||||||
Location newLocation = player.getLocation().clone().add(Settings.getBalloonOffset()).clone();
|
Location newLocation = player.getLocation();
|
||||||
if (player == null) return;
|
if (player == null || userBalloonManager == null || newLocation == null) return;
|
||||||
if (user.isInWardrobe()) return;
|
if (user.isInWardrobe()) return;
|
||||||
|
Location currentLocation = user.getBalloonManager().getLocation();
|
||||||
|
newLocation = newLocation.clone().add(Settings.getBalloonOffset());
|
||||||
|
|
||||||
List<Player> viewer = PacketManager.getViewers(player.getLocation());
|
List<Player> viewer = PacketManager.getViewers(player.getLocation());
|
||||||
viewer.add(player);
|
viewer.add(player);
|
||||||
|
|
||||||
BalloonEntity balloonEntity = user.getBalloonEntity();
|
if (player.getLocation().getWorld() != userBalloonManager.getLocation().getWorld()) {
|
||||||
|
userBalloonManager.getModelEntity().teleport(newLocation);
|
||||||
if (player.getLocation().getWorld() != balloonEntity.getLocation().getWorld()) {
|
PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
|
||||||
balloonEntity.getModelEntity().teleport(newLocation);
|
|
||||||
PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Vector velocity = newLocation.toVector().subtract(currentLocation.toVector());
|
Vector velocity = newLocation.toVector().subtract(currentLocation.toVector());
|
||||||
balloonEntity.setVelocity(velocity.multiply(1.1));
|
userBalloonManager.setVelocity(velocity.multiply(1.1));
|
||||||
balloonEntity.setLocation(newLocation);
|
userBalloonManager.setLocation(newLocation);
|
||||||
|
|
||||||
PacketManager.sendTeleportPacket(balloonEntity.getPufferfishBalloonId(), newLocation, false, viewer);
|
PacketManager.sendTeleportPacket(userBalloonManager.getPufferfishBalloonId(), newLocation, false, viewer);
|
||||||
if (!user.getHidden()) PacketManager.sendLeashPacket(balloonEntity.getPufferfishBalloonId(), player.getEntityId(), viewer);
|
if (!user.getHidden()) PacketManager.sendLeashPacket(userBalloonManager.getPufferfishBalloonId(), player.getEntityId(), viewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getModelName() {
|
public String getModelName() {
|
||||||
|
|||||||
@@ -0,0 +1,31 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.cosmetic.types;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
|
import org.spongepowered.configurate.ConfigurationNode;
|
||||||
|
|
||||||
|
public class CosmeticEmoteType extends Cosmetic {
|
||||||
|
|
||||||
|
private String animationId;
|
||||||
|
|
||||||
|
public CosmeticEmoteType(String id, ConfigurationNode config) {
|
||||||
|
super(id, config);
|
||||||
|
|
||||||
|
animationId = config.node("animation").getString();
|
||||||
|
MessagesUtil.sendDebugMessages("CosmeticEmoteType Animation id " + animationId);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void update(CosmeticUser user) {
|
||||||
|
// Nothing
|
||||||
|
}
|
||||||
|
|
||||||
|
public void run(CosmeticUser user) {
|
||||||
|
user.getUserEmoteManager().playEmote(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getAnimationId() {
|
||||||
|
return animationId;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,14 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.database.types;
|
package com.hibiscusmc.hmccosmetics.database.types;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
|
import org.apache.commons.lang3.EnumUtils;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Color;
|
import org.bukkit.Color;
|
||||||
import org.jetbrains.annotations.Nullable;
|
import org.jetbrains.annotations.Nullable;
|
||||||
|
|
||||||
@@ -34,6 +38,11 @@ public class Data {
|
|||||||
// BACKPACK=colorfulbackpack&RRGGBB,HELMET=niftyhat,BALLOON=colorfulballoon,CHESTPLATE=niftychestplate
|
// BACKPACK=colorfulbackpack&RRGGBB,HELMET=niftyhat,BALLOON=colorfulballoon,CHESTPLATE=niftychestplate
|
||||||
public String steralizeData(CosmeticUser user) {
|
public String steralizeData(CosmeticUser user) {
|
||||||
String data = "";
|
String data = "";
|
||||||
|
if (user.getHidden()) {
|
||||||
|
if (shouldHiddenSave(user.getHiddenReason())) {
|
||||||
|
data = "HIDDEN=" + user.getHiddenReason();
|
||||||
|
}
|
||||||
|
}
|
||||||
for (Cosmetic cosmetic : user.getCosmetic()) {
|
for (Cosmetic cosmetic : user.getCosmetic()) {
|
||||||
Color color = user.getCosmeticColor(cosmetic.getSlot());
|
Color color = user.getCosmeticColor(cosmetic.getSlot());
|
||||||
String input = cosmetic.getSlot() + "=" + cosmetic.getId();
|
String input = cosmetic.getSlot() + "=" + cosmetic.getId();
|
||||||
@@ -47,8 +56,9 @@ public class Data {
|
|||||||
return data;
|
return data;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Map<CosmeticSlot, Map<Cosmetic, Color>> desteralizedata(String raw) {
|
public Map<CosmeticSlot, Map<Cosmetic, Color>> desteralizedata(CosmeticUser user, String raw) {
|
||||||
Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = new HashMap<>();
|
Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = new HashMap<>();
|
||||||
|
boolean checkPermission = Settings.getForcePermissionJoin();
|
||||||
|
|
||||||
String[] rawData = raw.split(",");
|
String[] rawData = raw.split(",");
|
||||||
for (String a : rawData) {
|
for (String a : rawData) {
|
||||||
@@ -57,16 +67,33 @@ public class Data {
|
|||||||
CosmeticSlot slot = null;
|
CosmeticSlot slot = null;
|
||||||
Cosmetic cosmetic = null;
|
Cosmetic cosmetic = null;
|
||||||
MessagesUtil.sendDebugMessages("First split (suppose slot) " + splitData[0]);
|
MessagesUtil.sendDebugMessages("First split (suppose slot) " + splitData[0]);
|
||||||
|
if (splitData[0].equalsIgnoreCase("HIDDEN")) {
|
||||||
|
if (EnumUtils.isValidEnum(CosmeticUser.HiddenReason.class, splitData[1])) {
|
||||||
|
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
|
user.hideCosmetics(CosmeticUser.HiddenReason.valueOf(splitData[1]));
|
||||||
|
});
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
}
|
||||||
if (CosmeticSlot.valueOf(splitData[0]) != null) slot = CosmeticSlot.valueOf(splitData[0]);
|
if (CosmeticSlot.valueOf(splitData[0]) != null) slot = CosmeticSlot.valueOf(splitData[0]);
|
||||||
|
|
||||||
if (splitData[1].contains("&")) {
|
if (splitData[1].contains("&")) {
|
||||||
String[] colorSplitData = splitData[1].split("&");
|
String[] colorSplitData = splitData[1].split("&");
|
||||||
if (Cosmetics.hasCosmetic(colorSplitData[0])) cosmetic = Cosmetics.getCosmetic(colorSplitData[0]);
|
if (Cosmetics.hasCosmetic(colorSplitData[0])) cosmetic = Cosmetics.getCosmetic(colorSplitData[0]);
|
||||||
if (slot == null || cosmetic == null) continue;
|
if (slot == null || cosmetic == null) continue;
|
||||||
|
if (cosmetic.requiresPermission() && checkPermission) {
|
||||||
|
if (!user.getPlayer().hasPermission(cosmetic.getPermission())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
cosmetics.put(slot, Map.of(cosmetic, Color.fromRGB(Integer.parseInt(colorSplitData[1]))));
|
cosmetics.put(slot, Map.of(cosmetic, Color.fromRGB(Integer.parseInt(colorSplitData[1]))));
|
||||||
} else {
|
} else {
|
||||||
if (Cosmetics.hasCosmetic(splitData[1])) cosmetic = Cosmetics.getCosmetic(splitData[1]);
|
if (Cosmetics.hasCosmetic(splitData[1])) cosmetic = Cosmetics.getCosmetic(splitData[1]);
|
||||||
if (slot == null || cosmetic == null) continue;
|
if (slot == null || cosmetic == null) continue;
|
||||||
|
if (cosmetic.requiresPermission() && checkPermission) {
|
||||||
|
if (!user.getPlayer().hasPermission(cosmetic.getPermission())) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
HashMap<Cosmetic, Color> cosmeticColorHashMap = new HashMap<>();
|
HashMap<Cosmetic, Color> cosmeticColorHashMap = new HashMap<>();
|
||||||
cosmeticColorHashMap.put(cosmetic, null);
|
cosmeticColorHashMap.put(cosmetic, null);
|
||||||
cosmetics.put(slot, cosmeticColorHashMap);
|
cosmetics.put(slot, cosmeticColorHashMap);
|
||||||
@@ -74,4 +101,15 @@ public class Data {
|
|||||||
}
|
}
|
||||||
return cosmetics;
|
return cosmetics;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private boolean shouldHiddenSave(CosmeticUser.HiddenReason reason) {
|
||||||
|
switch (reason) {
|
||||||
|
case EMOTE, NONE -> {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
default -> {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ public class InternalData extends Data {
|
|||||||
if (!player.getPersistentDataContainer().has(key, PersistentDataType.STRING)) return user;
|
if (!player.getPersistentDataContainer().has(key, PersistentDataType.STRING)) return user;
|
||||||
String rawData = player.getPersistentDataContainer().get(key, PersistentDataType.STRING);
|
String rawData = player.getPersistentDataContainer().get(key, PersistentDataType.STRING);
|
||||||
|
|
||||||
Map<CosmeticSlot, Map<Cosmetic, Color>> a = desteralizedata(rawData);
|
Map<CosmeticSlot, Map<Cosmetic, Color>> a = desteralizedata(user, rawData);
|
||||||
for (Map<Cosmetic, Color> cosmeticColors : a.values()) {
|
for (Map<Cosmetic, Color> cosmeticColors : a.values()) {
|
||||||
for (Cosmetic cosmetic : cosmeticColors.keySet()) {
|
for (Cosmetic cosmetic : cosmeticColors.keySet()) {
|
||||||
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ public class MySQLData extends Data {
|
|||||||
ResultSet rs = preparedStatement.executeQuery();
|
ResultSet rs = preparedStatement.executeQuery();
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
String rawData = rs.getString("COSMETICS");
|
String rawData = rs.getString("COSMETICS");
|
||||||
Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(rawData);
|
Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
|
||||||
for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
|
for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
|
||||||
for (Cosmetic cosmetic : cosmeticColors.keySet()) {
|
for (Cosmetic cosmetic : cosmeticColors.keySet()) {
|
||||||
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public class SQLiteData extends Data {
|
|||||||
ResultSet rs = preparedStatement.executeQuery();
|
ResultSet rs = preparedStatement.executeQuery();
|
||||||
if (rs.next()) {
|
if (rs.next()) {
|
||||||
String rawData = rs.getString("COSMETICS");
|
String rawData = rs.getString("COSMETICS");
|
||||||
Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(rawData);
|
Map<CosmeticSlot, Map<Cosmetic, Color>> cosmetics = desteralizedata(user, rawData);
|
||||||
for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
|
for (Map<Cosmetic, Color> cosmeticColors : cosmetics.values()) {
|
||||||
for (Cosmetic cosmetic : cosmeticColors.keySet()) {
|
for (Cosmetic cosmetic : cosmeticColors.keySet()) {
|
||||||
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
|
|||||||
@@ -5,22 +5,18 @@ import com.hibiscusmc.hmccosmetics.api.PlayerMenuOpenEvent;
|
|||||||
import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
|
import com.hibiscusmc.hmccosmetics.config.serializer.ItemSerializer;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.type.Type;
|
import com.hibiscusmc.hmccosmetics.gui.type.Type;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.type.Types;
|
import com.hibiscusmc.hmccosmetics.gui.type.Types;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
|
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
|
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
|
import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
|
||||||
import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
|
import com.hibiscusmc.hmccosmetics.util.misc.Placeholder;
|
||||||
import dev.triumphteam.gui.builder.item.ItemBuilder;
|
import dev.triumphteam.gui.builder.item.ItemBuilder;
|
||||||
import dev.triumphteam.gui.guis.Gui;
|
import dev.triumphteam.gui.guis.Gui;
|
||||||
import dev.triumphteam.gui.guis.GuiItem;
|
import dev.triumphteam.gui.guis.GuiItem;
|
||||||
import me.clip.placeholderapi.PlaceholderAPI;
|
|
||||||
import net.kyori.adventure.text.Component;
|
import net.kyori.adventure.text.Component;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.event.inventory.ClickType;
|
import org.bukkit.event.inventory.ClickType;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
|
||||||
import org.spongepowered.configurate.ConfigurationNode;
|
import org.spongepowered.configurate.ConfigurationNode;
|
||||||
import org.spongepowered.configurate.serialize.SerializationException;
|
import org.spongepowered.configurate.serialize.SerializationException;
|
||||||
|
|
||||||
|
|||||||
@@ -39,6 +39,8 @@ public class Menus {
|
|||||||
return MENUS.containsValue(menu);
|
return MENUS.containsValue(menu);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Menu getDefaultMenu() { return Menus.getMenu(Settings.getDefaultMenu()); }
|
||||||
|
|
||||||
public static List<String> getMenuNames() {
|
public static List<String> getMenuNames() {
|
||||||
List<String> names = new ArrayList<>();
|
List<String> names = new ArrayList<>();
|
||||||
|
|
||||||
|
|||||||
@@ -22,6 +22,9 @@ public class Actions {
|
|||||||
private static ActionEquip ACTION_EQUIP = new ActionEquip();
|
private static ActionEquip ACTION_EQUIP = new ActionEquip();
|
||||||
private static ActionUnequip ACTION_UNEQUIP = new ActionUnequip();
|
private static ActionUnequip ACTION_UNEQUIP = new ActionUnequip();
|
||||||
private static ActionParticle ACTION_PARTICLE = new ActionParticle();
|
private static ActionParticle ACTION_PARTICLE = new ActionParticle();
|
||||||
|
private static ActionCosmeticShow ACTION_SHOW = new ActionCosmeticShow();
|
||||||
|
private static ActionCosmeticHide ACTION_HIDE = new ActionCosmeticHide();
|
||||||
|
private static ActionCosmeticToggle ACTION_TOGGLE = new ActionCosmeticToggle();
|
||||||
|
|
||||||
|
|
||||||
public static Action getAction(String id) {
|
public static Action getAction(String id) {
|
||||||
@@ -40,7 +43,7 @@ public class Actions {
|
|||||||
for (String a : raw) {
|
for (String a : raw) {
|
||||||
String id = StringUtils.substringBetween(a, "[", "]").toUpperCase();
|
String id = StringUtils.substringBetween(a, "[", "]").toUpperCase();
|
||||||
String message = StringUtils.substringAfter(a, "] ");
|
String message = StringUtils.substringAfter(a, "] ");
|
||||||
MessagesUtil.sendDebugMessages("ID is " + id + " // Message is " + message);
|
MessagesUtil.sendDebugMessages("ID is " + id + " // Raw Data is " + message);
|
||||||
if (isAction(id)) {
|
if (isAction(id)) {
|
||||||
getAction(id).run(user, message);
|
getAction(id).run(user, message);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.gui.action.actions;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.gui.action.Action;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
|
||||||
|
public class ActionCosmeticHide extends Action {
|
||||||
|
|
||||||
|
public ActionCosmeticHide() {
|
||||||
|
super("hide");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(CosmeticUser user, String raw) {
|
||||||
|
if (!user.getHidden()) {
|
||||||
|
user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.gui.action.actions;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.gui.action.Action;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
|
||||||
|
public class ActionCosmeticShow extends Action {
|
||||||
|
|
||||||
|
public ActionCosmeticShow() {
|
||||||
|
super("show");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(CosmeticUser user, String raw) {
|
||||||
|
if (user.getHidden()) {
|
||||||
|
if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return; // Do not hide if its already off for WG
|
||||||
|
user.showCosmetics();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.gui.action.actions;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.gui.action.Action;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
|
||||||
|
public class ActionCosmeticToggle extends Action {
|
||||||
|
|
||||||
|
public ActionCosmeticToggle() {
|
||||||
|
super("toggle");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void run(CosmeticUser user, String raw) {
|
||||||
|
if (user.getHidden()) {
|
||||||
|
if (user.getHiddenReason() != CosmeticUser.HiddenReason.ACTION && user.getHiddenReason() != CosmeticUser.HiddenReason.COMMAND) return;
|
||||||
|
user.showCosmetics();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
user.hideCosmetics(CosmeticUser.HiddenReason.ACTION);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,11 +14,20 @@ public class ActionMenu extends Action {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run(CosmeticUser user, String raw) {
|
public void run(CosmeticUser user, String raw) {
|
||||||
|
boolean ignorePermission = false;
|
||||||
|
|
||||||
|
raw = raw.replaceAll(" ", ""); // Removes all spaces
|
||||||
|
|
||||||
|
if (raw.contains("-o")) {
|
||||||
|
raw = raw.replaceAll("-o", "");
|
||||||
|
ignorePermission = true;
|
||||||
|
}
|
||||||
if (!Menus.hasMenu(raw)) {
|
if (!Menus.hasMenu(raw)) {
|
||||||
HMCCosmeticsPlugin.getInstance().getLogger().info("Invalid Action Menu -> " + raw);
|
HMCCosmeticsPlugin.getInstance().getLogger().info("Invalid Action Menu -> " + raw);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
Menu menu = Menus.getMenu(raw);
|
Menu menu = Menus.getMenu(raw);
|
||||||
menu.openMenu(user, true);
|
HMCCosmeticsPlugin.getInstance().getLogger().info(raw + " | " + ignorePermission);
|
||||||
|
menu.openMenu(user, ignorePermission);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -15,6 +15,7 @@ import org.bukkit.entity.Player;
|
|||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.ItemMeta;
|
||||||
import org.bukkit.inventory.meta.LeatherArmorMeta;
|
import org.bukkit.inventory.meta.LeatherArmorMeta;
|
||||||
|
import org.bukkit.inventory.meta.MapMeta;
|
||||||
import org.bukkit.inventory.meta.PotionMeta;
|
import org.bukkit.inventory.meta.PotionMeta;
|
||||||
|
|
||||||
public class DyeMenu {
|
public class DyeMenu {
|
||||||
@@ -36,9 +37,12 @@ public class DyeMenu {
|
|||||||
if (item == null) return;
|
if (item == null) return;
|
||||||
ItemMeta meta = item.getItemMeta();
|
ItemMeta meta = item.getItemMeta();
|
||||||
if (meta == null) return;
|
if (meta == null) return;
|
||||||
Color color = meta instanceof LeatherArmorMeta ? ((LeatherArmorMeta) meta).getColor() :
|
|
||||||
meta instanceof PotionMeta ? ((PotionMeta) meta).getColor() : null;
|
Color color = meta instanceof LeatherArmorMeta leatherMeta ? leatherMeta.getColor() :
|
||||||
|
meta instanceof PotionMeta potionMeta ? potionMeta.getColor() :
|
||||||
|
meta instanceof MapMeta mapMeta ? mapMeta.getColor() : null;
|
||||||
if (color == null) return;
|
if (color == null) return;
|
||||||
|
|
||||||
//user.removeCosmeticSlot(cosmetic);
|
//user.removeCosmeticSlot(cosmetic);
|
||||||
user.addPlayerCosmetic(cosmetic, color);
|
user.addPlayerCosmetic(cosmetic, color);
|
||||||
player.setItemOnCursor(new ItemStack(Material.AIR));
|
player.setItemOnCursor(new ItemStack(Material.AIR));
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
|||||||
import com.hibiscusmc.hmccosmetics.gui.action.Actions;
|
import com.hibiscusmc.hmccosmetics.gui.action.Actions;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
|
import com.hibiscusmc.hmccosmetics.gui.special.DyeMenu;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.type.Type;
|
import com.hibiscusmc.hmccosmetics.gui.type.Type;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
|
import com.hibiscusmc.hmccosmetics.hooks.Hooks;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
|
import com.hibiscusmc.hmccosmetics.util.misc.StringUtils;
|
||||||
@@ -107,23 +107,31 @@ public class TypeCosmetic extends Type {
|
|||||||
} else {
|
} else {
|
||||||
ConfigurationNode itemConfig = config.node("item");
|
ConfigurationNode itemConfig = config.node("item");
|
||||||
if (itemConfig.virtual()) return itemMeta;
|
if (itemConfig.virtual()) return itemMeta;
|
||||||
if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-name").virtual()) {
|
if (itemConfig.node("locked-name").virtual() && itemConfig.node("locked-lore").virtual()) {
|
||||||
return processLoreLines(user, itemMeta);
|
return processLoreLines(user, itemMeta);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
itemMeta.getLore().clear();
|
List<String> lockedLore = itemMeta.getLore();
|
||||||
|
String lockedName = itemMeta.getDisplayName();
|
||||||
|
|
||||||
List<String> lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class),
|
if (!itemConfig.node("locked-lore").virtual()) {
|
||||||
new ArrayList<String>()).
|
lockedLore = Utils.replaceIfNull(itemConfig.node("locked-lore").getList(String.class),
|
||||||
stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
|
new ArrayList<String>()).
|
||||||
|
stream().map(StringUtils::parseStringToString).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
if (!itemConfig.node("locked-name").virtual()) {
|
||||||
|
lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
|
||||||
|
}
|
||||||
|
|
||||||
if (PAPIHook.isPAPIEnabled()) {
|
if (Hooks.isActiveHook("PlaceHolderAPI")) {
|
||||||
String lockedName = StringUtils.parseStringToString(Utils.replaceIfNull(itemConfig.node("locked-name").getString(), ""));
|
lockedName = PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName);
|
||||||
itemMeta.setDisplayName(PlaceholderAPI.setPlaceholders(user.getPlayer(), lockedName));
|
}
|
||||||
if (itemMeta.hasLore()) {
|
itemMeta.setDisplayName(lockedName);
|
||||||
for (String loreLine : lockedLore) {
|
if (itemMeta.hasLore()) {
|
||||||
processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
|
itemMeta.getLore().clear();
|
||||||
}
|
for (String loreLine : lockedLore) {
|
||||||
|
if (Hooks.isActiveHook("PlaceHolderAPI")) loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
|
||||||
|
processedLore.add(loreLine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
@@ -138,11 +146,11 @@ public class TypeCosmetic extends Type {
|
|||||||
private ItemMeta processLoreLines(CosmeticUser user, ItemMeta itemMeta) {
|
private ItemMeta processLoreLines(CosmeticUser user, ItemMeta itemMeta) {
|
||||||
List<String> processedLore = new ArrayList<>();
|
List<String> processedLore = new ArrayList<>();
|
||||||
|
|
||||||
if (PAPIHook.isPAPIEnabled()) {
|
if (itemMeta.hasLore()) {
|
||||||
if (itemMeta.hasLore()) {
|
for (String loreLine : itemMeta.getLore()) {
|
||||||
for (String loreLine : itemMeta.getLore()) {
|
if (Hooks.isActiveHook("PlaceholderAPI"))
|
||||||
processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
|
loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
|
||||||
}
|
processedLore.add(loreLine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ package com.hibiscusmc.hmccosmetics.gui.type.types;
|
|||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.gui.action.Actions;
|
import com.hibiscusmc.hmccosmetics.gui.action.Actions;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.type.Type;
|
import com.hibiscusmc.hmccosmetics.gui.type.Type;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
|
import com.hibiscusmc.hmccosmetics.hooks.Hooks;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.placeholders.HMCPlaceholderExpansion;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import me.clip.placeholderapi.PlaceholderAPI;
|
import me.clip.placeholderapi.PlaceholderAPI;
|
||||||
import org.bukkit.event.inventory.ClickType;
|
import org.bukkit.event.inventory.ClickType;
|
||||||
@@ -55,11 +56,11 @@ public class TypeEmpty extends Type {
|
|||||||
public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
|
public ItemMeta setLore(CosmeticUser user, ConfigurationNode config, ItemMeta itemMeta) {
|
||||||
List<String> processedLore = new ArrayList<>();
|
List<String> processedLore = new ArrayList<>();
|
||||||
|
|
||||||
if (PAPIHook.isPAPIEnabled()) {
|
if (itemMeta.hasLore()) {
|
||||||
if (itemMeta.hasLore()) {
|
for (String loreLine : itemMeta.getLore()) {
|
||||||
for (String loreLine : itemMeta.getLore()) {
|
if (Hooks.isActiveHook("PlaceholderAPI"))
|
||||||
processedLore.add(PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine));
|
loreLine = PlaceholderAPI.setPlaceholders(user.getPlayer(), loreLine);
|
||||||
}
|
processedLore.add(loreLine);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,20 +1,25 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.hooks.items;
|
package com.hibiscusmc.hmccosmetics.hooks;
|
||||||
|
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class ItemHook implements Listener {
|
public class Hook implements Listener {
|
||||||
|
|
||||||
private String id;
|
private String id;
|
||||||
private boolean active;
|
private boolean active;
|
||||||
|
private boolean itemHook;
|
||||||
|
|
||||||
public ItemHook(String id) {
|
public Hook(String id) {
|
||||||
this.id = id;
|
this.id = id;
|
||||||
active = false;
|
active = false;
|
||||||
ItemHooks.addItemHook(this);
|
Hooks.addHook(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
public ItemStack get(String itemid) {
|
public void load() {
|
||||||
|
// Override
|
||||||
|
}
|
||||||
|
|
||||||
|
public ItemStack getItem(String itemid) {
|
||||||
return null;
|
return null;
|
||||||
// Override
|
// Override
|
||||||
}
|
}
|
||||||
@@ -30,4 +35,12 @@ public class ItemHook implements Listener {
|
|||||||
public boolean getActive() {
|
public boolean getActive() {
|
||||||
return this.active;
|
return this.active;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setEnabledItemHook(boolean enabled) {
|
||||||
|
itemHook = enabled;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean hasEnabledItemHook() {
|
||||||
|
return itemHook;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.hooks;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.items.*;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.misc.HookPremiumVanish;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.misc.HookSuperVanish;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.placeholders.HookPlaceholderAPI;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
|
public class Hooks {
|
||||||
|
|
||||||
|
private static HashMap<String, Hook> hooks = new HashMap<>();
|
||||||
|
private static HookOraxen ORAXEN_HOOK = new HookOraxen();
|
||||||
|
private static HookItemAdder ITEMADDER_HOOK = new HookItemAdder();
|
||||||
|
private static HookLooty LOOTY_HOOK = new HookLooty();
|
||||||
|
private static HookMythic MYTHIC_HOOK = new HookMythic();
|
||||||
|
private static HookHMCCosmetics HMCCOSMETIC_HOOK = new HookHMCCosmetics();
|
||||||
|
private static HookPlaceholderAPI PAPI_HOOK = new HookPlaceholderAPI();
|
||||||
|
private static HookPremiumVanish PREMIUM_VANISH_HOOK = new HookPremiumVanish();
|
||||||
|
private static HookSuperVanish SUPER_VANISH_HOOK = new HookSuperVanish();
|
||||||
|
|
||||||
|
public static Hook getHook(String id) {
|
||||||
|
return hooks.get(id.toLowerCase());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isItemHook(String id) {
|
||||||
|
return hooks.containsKey(id.toLowerCase());
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void addHook(Hook hook) {
|
||||||
|
hooks.put(hook.getId().toLowerCase(), hook);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static void setup() {
|
||||||
|
for (Hook hook : hooks.values()) {
|
||||||
|
if (Bukkit.getPluginManager().getPlugin(hook.getId()) != null) {
|
||||||
|
HMCCosmeticsPlugin.getInstance().getServer().getPluginManager().registerEvents(hook, HMCCosmeticsPlugin.getInstance());
|
||||||
|
hook.setActive(true);
|
||||||
|
hook.load();
|
||||||
|
HMCCosmeticsPlugin.getInstance().getLogger().info("Successfully hooked into " + hook.getId());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public static ItemStack getItem(String raw) {
|
||||||
|
if (!raw.contains(":")) {
|
||||||
|
Material mat = Material.getMaterial(raw.toUpperCase());
|
||||||
|
if (mat == null) return null;
|
||||||
|
return new ItemStack(mat);
|
||||||
|
}
|
||||||
|
// Ex. Oraxen:BigSword
|
||||||
|
// split[0] is the plugin name
|
||||||
|
// split[1] is the item name
|
||||||
|
String[] split = raw.split(":", 2);
|
||||||
|
|
||||||
|
if (!isItemHook(split[0])) return null;
|
||||||
|
Hook hook = getHook(split[0]);
|
||||||
|
if (!hook.hasEnabledItemHook()) return null;
|
||||||
|
if (!hook.getActive()) return null;
|
||||||
|
ItemStack item = hook.getItem(split[1]);
|
||||||
|
return item;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static boolean isActiveHook(String id) {
|
||||||
|
if (!hooks.containsKey(getHook(id))) return false;
|
||||||
|
return hooks.get(getHook(id)).getActive();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -2,17 +2,19 @@ package com.hibiscusmc.hmccosmetics.hooks.items;
|
|||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetics;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class HMCCosmeticsHook extends ItemHook implements Listener {
|
public class HookHMCCosmetics extends Hook implements Listener {
|
||||||
|
|
||||||
public HMCCosmeticsHook() {
|
public HookHMCCosmetics() {
|
||||||
super("HMCCosmetics");
|
super("HMCCosmetics");
|
||||||
|
setEnabledItemHook(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack get(String itemid) {
|
public ItemStack getItem(String itemid) {
|
||||||
Cosmetic cosmetic = Cosmetics.getCosmetic(itemid);
|
Cosmetic cosmetic = Cosmetics.getCosmetic(itemid);
|
||||||
if (cosmetic == null) return null;
|
if (cosmetic == null) return null;
|
||||||
return cosmetic.getItem();
|
return cosmetic.getItem();
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.hooks.items;
|
package com.hibiscusmc.hmccosmetics.hooks.items;
|
||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
import dev.lone.itemsadder.api.CustomStack;
|
import dev.lone.itemsadder.api.CustomStack;
|
||||||
import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;
|
import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
@@ -8,18 +9,19 @@ import org.bukkit.event.EventHandler;
|
|||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class ItemAdderHook extends ItemHook implements Listener {
|
public class HookItemAdder extends Hook implements Listener {
|
||||||
|
|
||||||
// I hate IA, this overcomplicate stuff is so unneeded if it just did its stuff when its needed.
|
// I hate IA, this overcomplicate stuff is so unneeded if it just did its stuff when its needed.
|
||||||
|
|
||||||
private boolean enabled = false;
|
private boolean enabled = false;
|
||||||
|
|
||||||
public ItemAdderHook() {
|
public HookItemAdder() {
|
||||||
super("itemsadder");
|
super("itemsadder");
|
||||||
|
setEnabledItemHook(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack get(String itemid) {
|
public ItemStack getItem(String itemid) {
|
||||||
if (enabled) {
|
if (enabled) {
|
||||||
CustomStack stack = CustomStack.getInstance(itemid);
|
CustomStack stack = CustomStack.getInstance(itemid);
|
||||||
if (stack == null) return null;
|
if (stack == null) return null;
|
||||||
@@ -31,6 +33,7 @@ public class ItemAdderHook extends ItemHook implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onItemAdderDataLoad(ItemsAdderLoadDataEvent event) {
|
public void onItemAdderDataLoad(ItemsAdderLoadDataEvent event) {
|
||||||
|
if (enabled) return; // Only run on the first event fired; ignore all rest
|
||||||
this.enabled = true;
|
this.enabled = true;
|
||||||
HMCCosmeticsPlugin.setup();
|
HMCCosmeticsPlugin.setup();
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.hooks.items;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
|
import com.mineinabyss.geary.prefabs.PrefabKey;
|
||||||
|
import com.mineinabyss.looty.LootyFactory;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
public class HookLooty extends Hook implements Listener {
|
||||||
|
|
||||||
|
public HookLooty() {
|
||||||
|
super("looty");
|
||||||
|
setEnabledItemHook(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getItem(String itemid) {
|
||||||
|
PrefabKey prefabKey = PrefabKey.Companion.ofOrNull(itemid);
|
||||||
|
if (prefabKey == null) return null;
|
||||||
|
return LootyFactory.INSTANCE.createFromPrefab(prefabKey);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,16 +1,18 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.hooks.items;
|
package com.hibiscusmc.hmccosmetics.hooks.items;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
import io.lumine.mythic.bukkit.MythicBukkit;
|
import io.lumine.mythic.bukkit.MythicBukkit;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
public class MythicHook extends ItemHook implements Listener {
|
public class HookMythic extends Hook implements Listener {
|
||||||
public MythicHook() {
|
public HookMythic() {
|
||||||
super("mythicmobs");
|
super("mythicmobs");
|
||||||
|
setEnabledItemHook(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public ItemStack get(String itemid) {
|
public ItemStack getItem(String itemid) {
|
||||||
return MythicBukkit.inst().getItemManager().getItemStack(itemid);
|
return MythicBukkit.inst().getItemManager().getItemStack(itemid);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.hooks.items;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
|
import io.th0rgal.oraxen.api.OraxenItems;
|
||||||
|
import io.th0rgal.oraxen.items.ItemBuilder;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
public class HookOraxen extends Hook implements Listener {
|
||||||
|
|
||||||
|
public HookOraxen() {
|
||||||
|
super("oraxen");
|
||||||
|
setEnabledItemHook(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public ItemStack getItem(String itemid) {
|
||||||
|
ItemBuilder builder = OraxenItems.getItemById(itemid);
|
||||||
|
if (builder == null) return null;
|
||||||
|
return builder.build();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.hooks.items;
|
|
||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
|
||||||
import org.bukkit.Bukkit;
|
|
||||||
import org.bukkit.Material;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
|
|
||||||
import java.util.HashMap;
|
|
||||||
|
|
||||||
public class ItemHooks {
|
|
||||||
|
|
||||||
private static HashMap<String, ItemHook> itemHooks = new HashMap<>();
|
|
||||||
private static OraxenHook ORAXEN_HOOK = new OraxenHook();
|
|
||||||
private static ItemAdderHook ITEMADDER_HOOK = new ItemAdderHook();
|
|
||||||
private static MythicHook MYTHIC_HOOK = new MythicHook();
|
|
||||||
private static HMCCosmeticsHook HMCCOSMETIC_HOOK = new HMCCosmeticsHook();
|
|
||||||
|
|
||||||
public static ItemHook getItemHook(String id) {
|
|
||||||
return itemHooks.get(id.toLowerCase());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static boolean isItemHook(String id) {
|
|
||||||
return itemHooks.containsKey(id.toLowerCase());
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void addItemHook(ItemHook hook) {
|
|
||||||
itemHooks.put(hook.getId().toLowerCase(), hook);
|
|
||||||
}
|
|
||||||
|
|
||||||
public static void setup() {
|
|
||||||
for (ItemHook itemHook : itemHooks.values()) {
|
|
||||||
if (Bukkit.getPluginManager().getPlugin(itemHook.getId()) != null) {
|
|
||||||
HMCCosmeticsPlugin.getInstance().getServer().getPluginManager().registerEvents(itemHook, HMCCosmeticsPlugin.getInstance());
|
|
||||||
itemHook.setActive(true);
|
|
||||||
HMCCosmeticsPlugin.getInstance().getLogger().info("Successfully hooked into " + itemHook.getId());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public static ItemStack getItem(String raw) {
|
|
||||||
if (!raw.contains(":")) {
|
|
||||||
Material mat = Material.getMaterial(raw.toUpperCase());
|
|
||||||
if (mat == null) return null;
|
|
||||||
return new ItemStack(mat);
|
|
||||||
}
|
|
||||||
// Ex. Oraxen:BigSword
|
|
||||||
// split[0] is the plugin name
|
|
||||||
// split[1] is the item name
|
|
||||||
String[] split = raw.split(":", 2);
|
|
||||||
|
|
||||||
if (!isItemHook(split[0])) return null;
|
|
||||||
ItemHook itemHook = getItemHook(split[0]);
|
|
||||||
if (!itemHook.getActive()) return null;
|
|
||||||
ItemStack item = itemHook.get(split[1]);
|
|
||||||
return item;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.hooks.items;
|
|
||||||
|
|
||||||
import io.th0rgal.oraxen.api.OraxenItems;
|
|
||||||
import org.bukkit.event.Listener;
|
|
||||||
import org.bukkit.inventory.ItemStack;
|
|
||||||
|
|
||||||
public class OraxenHook extends ItemHook implements Listener {
|
|
||||||
|
|
||||||
public OraxenHook() {
|
|
||||||
super("oraxen");
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public ItemStack get(String itemid) {
|
|
||||||
return OraxenItems.getItemById(itemid).build();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.hooks.misc;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
|
||||||
|
import de.myzelyam.api.vanish.PlayerHideEvent;
|
||||||
|
import de.myzelyam.api.vanish.PlayerShowEvent;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
|
public class HookPremiumVanish extends Hook implements Listener {
|
||||||
|
|
||||||
|
// NOTE: Supervanish and Premium Vanish both use the same api
|
||||||
|
|
||||||
|
public HookPremiumVanish() {
|
||||||
|
super("PremiumVanish");
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onPlayerVanish(PlayerHideEvent event) {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
if (user == null) return;
|
||||||
|
user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onPlayerShow(PlayerShowEvent event) {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
if (user == null) return;
|
||||||
|
user.showCosmetics();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.hooks.misc;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUsers;
|
||||||
|
import de.myzelyam.api.vanish.PlayerHideEvent;
|
||||||
|
import de.myzelyam.api.vanish.PlayerShowEvent;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.event.EventHandler;
|
||||||
|
import org.bukkit.event.Listener;
|
||||||
|
|
||||||
|
public class HookSuperVanish extends Hook implements Listener {
|
||||||
|
|
||||||
|
// NOTE: Supervanish and Premium Vanish both use the same api
|
||||||
|
|
||||||
|
public HookSuperVanish() {
|
||||||
|
super("SuperVanish");
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onPlayerVanish(PlayerHideEvent event) {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
if (user == null) return;
|
||||||
|
user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
|
||||||
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onPlayerShow(PlayerShowEvent event) {
|
||||||
|
Player player = event.getPlayer();
|
||||||
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
if (user == null) return;
|
||||||
|
user.showCosmetics();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.hooks;
|
package com.hibiscusmc.hmccosmetics.hooks.placeholders;
|
||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
@@ -16,11 +16,11 @@ import org.jetbrains.annotations.NotNull;
|
|||||||
import java.util.Arrays;
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class PAPIHook extends PlaceholderExpansion {
|
public class HMCPlaceholderExpansion extends PlaceholderExpansion {
|
||||||
|
|
||||||
private static boolean papiEnabled = false;
|
private static boolean papiEnabled = false;
|
||||||
|
|
||||||
public PAPIHook() {
|
public HMCPlaceholderExpansion() {
|
||||||
papiEnabled = true;
|
papiEnabled = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -54,7 +54,9 @@ public class PAPIHook extends PlaceholderExpansion {
|
|||||||
}
|
}
|
||||||
if (placeholderArgs.get(1) != null) {
|
if (placeholderArgs.get(1) != null) {
|
||||||
Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
|
Cosmetic cosmetic = Cosmetics.getCosmetic(placeholderArgs.get(1));
|
||||||
if (user.getCosmetic(cosmetic.getSlot()).getId() == cosmetic.getId()) return "true";
|
Cosmetic currentCosmetic = user.getCosmetic(cosmetic.getSlot());
|
||||||
|
if (cosmetic == null || currentCosmetic == null) return "false";
|
||||||
|
if (currentCosmetic.getId() == cosmetic.getId()) return "true";
|
||||||
return "false";
|
return "false";
|
||||||
}
|
}
|
||||||
case "current":
|
case "current":
|
||||||
@@ -64,6 +66,7 @@ public class PAPIHook extends PlaceholderExpansion {
|
|||||||
if (placeholderArgs.get(1) != null) {
|
if (placeholderArgs.get(1) != null) {
|
||||||
CosmeticSlot slot = CosmeticSlot.valueOf(placeholderArgs.get(1).toUpperCase());
|
CosmeticSlot slot = CosmeticSlot.valueOf(placeholderArgs.get(1).toUpperCase());
|
||||||
if (slot == null) return null;
|
if (slot == null) return null;
|
||||||
|
if (user.getCosmetic(slot) == null) return null;
|
||||||
if (placeholderArgs.size() == 2) return user.getCosmetic(slot).getId();
|
if (placeholderArgs.size() == 2) return user.getCosmetic(slot).getId();
|
||||||
switch (placeholderArgs.get(2).toLowerCase()) {
|
switch (placeholderArgs.get(2).toLowerCase()) {
|
||||||
case "material" -> {
|
case "material" -> {
|
||||||
@@ -159,8 +162,4 @@ public class PAPIHook extends PlaceholderExpansion {
|
|||||||
}
|
}
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static boolean isPAPIEnabled() {
|
|
||||||
return papiEnabled;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.hooks.placeholders;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.Hook;
|
||||||
|
|
||||||
|
public class HookPlaceholderAPI extends Hook {
|
||||||
|
|
||||||
|
public HookPlaceholderAPI() {
|
||||||
|
super("placeholderapi");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void load() {
|
||||||
|
new HMCPlaceholderExpansion().register();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -24,9 +24,10 @@ public class WGListener implements Listener {
|
|||||||
RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
|
RegionContainer region = WorldGuard.getInstance().getPlatform().getRegionContainer();
|
||||||
RegionQuery query = region.createQuery();
|
RegionQuery query = region.createQuery();
|
||||||
ApplicableRegionSet set = query.getApplicableRegions(loc);
|
ApplicableRegionSet set = query.getApplicableRegions(loc);
|
||||||
// TODO: Add more cosmetics
|
if (user.getHidden()) {
|
||||||
if (set.getRegions().size() == 0) {
|
if (user.getHiddenReason() == CosmeticUser.HiddenReason.WORLDGUARD && set.getRegions().size() == 0) {
|
||||||
user.showCosmetics();
|
user.showCosmetics();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
for (ProtectedRegion protectedRegion : set.getRegions()) {
|
for (ProtectedRegion protectedRegion : set.getRegions()) {
|
||||||
if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) {
|
if (protectedRegion.getFlags().containsKey(WGHook.getCosmeticEnableFlag())) {
|
||||||
|
|||||||
@@ -18,6 +18,18 @@ public class PlayerConnectionListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||||
|
if (event.getPlayer().isOp() || event.getPlayer().hasPermission("hmccosmetics.notifyupdate")) {
|
||||||
|
if (!HMCCosmeticsPlugin.getLatestVersion().equalsIgnoreCase(HMCCosmeticsPlugin.getInstance().getDescription().getVersion()) && HMCCosmeticsPlugin.getLatestVersion() != null)
|
||||||
|
MessagesUtil.sendMessageNoKey(
|
||||||
|
event.getPlayer(),
|
||||||
|
"<br>" +
|
||||||
|
"<GRAY>There is a new version of <light_purple><Bold>HMCCosmetics<reset><gray> available!<br>" +
|
||||||
|
"<GRAY>Current version: <red>" + HMCCosmeticsPlugin.getInstance().getDescription().getVersion() + " <GRAY>| Latest version: <light_purple>" + HMCCosmeticsPlugin.getLatestVersion() + "<br>" +
|
||||||
|
"<GRAY>Download it on <gold><click:OPEN_URL:'https://www.spigotmc.org/resources/100107/'>Spigot<reset> <gray>or <gold><click:OPEN_URL:'https://polymart.org/resource/1879'>Polymart<reset><gray>!" +
|
||||||
|
"<br>"
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
Runnable run = () -> {
|
Runnable run = () -> {
|
||||||
CosmeticUser user = Database.get(event.getPlayer().getUniqueId());
|
CosmeticUser user = Database.get(event.getPlayer().getUniqueId());
|
||||||
CosmeticUsers.addUser(user);
|
CosmeticUsers.addUser(user);
|
||||||
@@ -46,6 +58,10 @@ public class PlayerConnectionListener implements Listener {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (user.isInWardrobe()) user.leaveWardrobe();
|
if (user.isInWardrobe()) user.leaveWardrobe();
|
||||||
|
if (user.getUserEmoteManager().isPlayingEmote()) {
|
||||||
|
user.getUserEmoteManager().stopEmote();
|
||||||
|
event.getPlayer().setInvisible(false);
|
||||||
|
}
|
||||||
Database.save(user);
|
Database.save(user);
|
||||||
user.destroy();
|
user.destroy();
|
||||||
CosmeticUsers.removeUser(user.getUniqueId());
|
CosmeticUsers.removeUser(user.getUniqueId());
|
||||||
|
|||||||
@@ -13,6 +13,8 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.Menu;
|
import com.hibiscusmc.hmccosmetics.gui.Menu;
|
||||||
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
import com.hibiscusmc.hmccosmetics.gui.Menus;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
@@ -29,6 +31,7 @@ import org.bukkit.entity.Player;
|
|||||||
import org.bukkit.event.EventHandler;
|
import org.bukkit.event.EventHandler;
|
||||||
import org.bukkit.event.Listener;
|
import org.bukkit.event.Listener;
|
||||||
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
import org.bukkit.event.entity.EntityDamageByEntityEvent;
|
||||||
|
import org.bukkit.event.entity.EntityPickupItemEvent;
|
||||||
import org.bukkit.event.entity.EntityPotionEffectEvent;
|
import org.bukkit.event.entity.EntityPotionEffectEvent;
|
||||||
import org.bukkit.event.entity.PlayerDeathEvent;
|
import org.bukkit.event.entity.PlayerDeathEvent;
|
||||||
import org.bukkit.event.inventory.ClickType;
|
import org.bukkit.event.inventory.ClickType;
|
||||||
@@ -79,8 +82,12 @@ public class PlayerGameListener implements Listener {
|
|||||||
public void onPlayerShift(PlayerToggleSneakEvent event) {
|
public void onPlayerShift(PlayerToggleSneakEvent event) {
|
||||||
CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
|
CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
|
||||||
|
|
||||||
if (!event.isSneaking()) return;
|
|
||||||
if (user == null) return;
|
if (user == null) return;
|
||||||
|
if (event.isSneaking()) {
|
||||||
|
user.getUserEmoteManager().stopEmote();
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!event.isSneaking()) return;
|
||||||
if (!user.isInWardrobe()) return;
|
if (!user.isInWardrobe()) return;
|
||||||
|
|
||||||
user.leaveWardrobe();
|
user.leaveWardrobe();
|
||||||
@@ -97,9 +104,9 @@ public class PlayerGameListener implements Listener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
if (user.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
||||||
user.hideBackpack();
|
user.getUserBackpackManager().hideBackpack();
|
||||||
|
|
||||||
user.getBackpackEntity().teleport(event.getTo());
|
user.getUserBackpackManager().getArmorstand().teleport(event.getTo());
|
||||||
|
|
||||||
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
user.updateCosmetic();
|
user.updateCosmetic();
|
||||||
@@ -109,8 +116,10 @@ public class PlayerGameListener implements Listener {
|
|||||||
if (event.getCause().equals(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL) || event.getCause().equals(PlayerTeleportEvent.TeleportCause.END_PORTAL)) return;
|
if (event.getCause().equals(PlayerTeleportEvent.TeleportCause.NETHER_PORTAL) || event.getCause().equals(PlayerTeleportEvent.TeleportCause.END_PORTAL)) return;
|
||||||
|
|
||||||
if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
if (user.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
||||||
|
final CosmeticBalloonType cosmeticBalloonType = (CosmeticBalloonType) user.getCosmetic(CosmeticSlot.BALLOON);
|
||||||
|
user.despawnBalloon();
|
||||||
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
user.updateCosmetic(CosmeticSlot.BALLOON);
|
user.spawnBalloon(cosmeticBalloonType);
|
||||||
}, 2);
|
}, 2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,6 +156,7 @@ public class PlayerGameListener implements Listener {
|
|||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void onPlayerLook(PlayerMoveEvent event) {
|
public void onPlayerLook(PlayerMoveEvent event) {
|
||||||
|
if (event.isCancelled()) return;
|
||||||
// TODO: Move to packets
|
// TODO: Move to packets
|
||||||
CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
|
CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
|
||||||
if (user == null) return;
|
if (user == null) return;
|
||||||
@@ -194,11 +204,25 @@ public class PlayerGameListener implements Listener {
|
|||||||
CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
|
CosmeticUser user = CosmeticUsers.getUser(event.getPlayer().getUniqueId());
|
||||||
if (user == null) return;
|
if (user == null) return;
|
||||||
// Really need to look into optimization of this
|
// Really need to look into optimization of this
|
||||||
|
if (user.hasCosmeticInSlot(CosmeticSlot.EMOTE) && event.getPlayer().isSneaking() && event.getPlayer().hasPermission("hmccosmetics.emote.shiftrun")) {
|
||||||
|
CosmeticEmoteType cosmeticEmoteType = (CosmeticEmoteType) user.getCosmetic(CosmeticSlot.EMOTE);
|
||||||
|
cosmeticEmoteType.run(user);
|
||||||
|
event.setCancelled(true);
|
||||||
|
return;
|
||||||
|
}
|
||||||
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
user.updateCosmetic(CosmeticSlot.OFFHAND);
|
user.updateCosmetic(CosmeticSlot.OFFHAND);
|
||||||
}, 2);
|
}, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@EventHandler
|
||||||
|
public void onPlayerPickupItem(EntityPickupItemEvent event) {
|
||||||
|
if (!(event.getEntity() instanceof Player)) return;
|
||||||
|
CosmeticUser user = CosmeticUsers.getUser(event.getEntity().getUniqueId());
|
||||||
|
if (user == null) return;
|
||||||
|
if (user.isInWardrobe()) event.setCancelled(true);
|
||||||
|
}
|
||||||
|
|
||||||
@EventHandler
|
@EventHandler
|
||||||
public void playerInvisibility(EntityPotionEffectEvent event) {
|
public void playerInvisibility(EntityPotionEffectEvent event) {
|
||||||
if (event.isCancelled()) return;
|
if (event.isCancelled()) return;
|
||||||
@@ -206,8 +230,9 @@ public class PlayerGameListener implements Listener {
|
|||||||
if (!event.getEntityType().equals(EntityType.PLAYER)) return;
|
if (!event.getEntityType().equals(EntityType.PLAYER)) return;
|
||||||
Player player = (Player) event.getEntity();
|
Player player = (Player) event.getEntity();
|
||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
|
if (user == null) return;
|
||||||
if (event.getAction().equals(EntityPotionEffectEvent.Action.ADDED)) {
|
if (event.getAction().equals(EntityPotionEffectEvent.Action.ADDED)) {
|
||||||
user.hideCosmetics(CosmeticUser.HiddenReason.PLUGIN);
|
user.hideCosmetics(CosmeticUser.HiddenReason.POTION);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (event.getAction().equals(EntityPotionEffectEvent.Action.CLEARED) || event.getAction().equals(EntityPotionEffectEvent.Action.REMOVED)) {
|
if (event.getAction().equals(EntityPotionEffectEvent.Action.CLEARED) || event.getAction().equals(EntityPotionEffectEvent.Action.REMOVED)) {
|
||||||
@@ -351,7 +376,7 @@ public class PlayerGameListener implements Listener {
|
|||||||
CosmeticUser user = CosmeticUsers.getUser(player);
|
CosmeticUser user = CosmeticUsers.getUser(player);
|
||||||
if (user == null) return;
|
if (user == null) return;
|
||||||
if (!user.isInWardrobe()) return;
|
if (!user.isInWardrobe()) return;
|
||||||
Menu menu = Menus.getMenu(Settings.getDefaultMenu());
|
Menu menu = Menus.getDefaultMenu();
|
||||||
if (menu == null) return;
|
if (menu == null) return;
|
||||||
menu.openMenu(user);
|
menu.openMenu(user);
|
||||||
event.setCancelled(true);
|
event.setCancelled(true);
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ package com.hibiscusmc.hmccosmetics.nms;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
import org.bukkit.entity.ArmorStand;
|
import org.bukkit.entity.ArmorStand;
|
||||||
@@ -25,7 +25,7 @@ public interface NMSHandler {
|
|||||||
|
|
||||||
Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);
|
Entity spawnBackpack(CosmeticUser user, CosmeticBackpackType cosmeticBackpackType);
|
||||||
|
|
||||||
BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
|
UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType);
|
||||||
|
|
||||||
void equipmentSlotUpdate(
|
void equipmentSlotUpdate(
|
||||||
int entityId,
|
int entityId,
|
||||||
|
|||||||
@@ -34,7 +34,7 @@ public class NMSHandlers {
|
|||||||
if (!selectedVersion.contains(packageVersion)) {
|
if (!selectedVersion.contains(packageVersion)) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
MessagesUtil.sendDebugMessages(packageVersion + " has been detected.", Level.SEVERE);
|
MessagesUtil.sendDebugMessages(packageVersion + " has been detected.", Level.INFO);
|
||||||
version = packageVersion;
|
version = packageVersion;
|
||||||
try {
|
try {
|
||||||
//Class.forName("org.bukkit.craftbukkit." + version + ".block.CraftBlock").getName();
|
//Class.forName("org.bukkit.craftbukkit." + version + ".block.CraftBlock").getName();
|
||||||
|
|||||||
@@ -6,25 +6,23 @@ import com.hibiscusmc.hmccosmetics.config.Settings;
|
|||||||
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
import com.hibiscusmc.hmccosmetics.cosmetic.Cosmetic;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.*;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBackpackManager;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
|
||||||
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.manager.UserEmoteManager;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.manager.UserWardrobeManager;
|
||||||
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
|
import com.hibiscusmc.hmccosmetics.util.PlayerUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.Color;
|
import org.bukkit.Color;
|
||||||
|
import org.bukkit.Location;
|
||||||
import org.bukkit.Material;
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.ArmorStand;
|
|
||||||
import org.bukkit.entity.Entity;
|
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
import org.bukkit.inventory.ItemStack;
|
import org.bukkit.inventory.ItemStack;
|
||||||
import org.bukkit.inventory.meta.ItemMeta;
|
import org.bukkit.inventory.meta.*;
|
||||||
import org.bukkit.inventory.meta.LeatherArmorMeta;
|
|
||||||
import org.bukkit.scheduler.BukkitTask;
|
import org.bukkit.scheduler.BukkitTask;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -35,22 +33,19 @@ public class CosmeticUser {
|
|||||||
private UUID uniqueId;
|
private UUID uniqueId;
|
||||||
private int taskId;
|
private int taskId;
|
||||||
private HashMap<CosmeticSlot, Cosmetic> playerCosmetics = new HashMap<>();
|
private HashMap<CosmeticSlot, Cosmetic> playerCosmetics = new HashMap<>();
|
||||||
private Wardrobe wardrobe;
|
private UserWardrobeManager userWardrobeManager;
|
||||||
private ArmorStand invisibleArmorstand;
|
private UserBalloonManager userBalloonManager;
|
||||||
private BalloonEntity balloonEntity;
|
private UserBackpackManager userBackpackManager;
|
||||||
|
private UserEmoteManager userEmoteManager;
|
||||||
|
|
||||||
// Cosmetic Settings/Toggles
|
// Cosmetic Settings/Toggles
|
||||||
private boolean hideBackpack;
|
|
||||||
private boolean hideCosmetics;
|
private boolean hideCosmetics;
|
||||||
private HiddenReason hiddenReason;
|
private HiddenReason hiddenReason;
|
||||||
private HashMap<CosmeticSlot, Color> colors = new HashMap<>();
|
private HashMap<CosmeticSlot, Color> colors = new HashMap<>();
|
||||||
|
|
||||||
public CosmeticUser() {
|
|
||||||
// Empty
|
|
||||||
}
|
|
||||||
|
|
||||||
public CosmeticUser(UUID uuid) {
|
public CosmeticUser(UUID uuid) {
|
||||||
this.uniqueId = uuid;
|
this.uniqueId = uuid;
|
||||||
|
userEmoteManager = new UserEmoteManager(this);
|
||||||
tick();
|
tick();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -86,17 +81,6 @@ public class CosmeticUser {
|
|||||||
return playerCosmetics.values();
|
return playerCosmetics.values();
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getArmorstandId() {
|
|
||||||
return invisibleArmorstand.getEntityId();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Entity getBackpackEntity() {
|
|
||||||
return this.invisibleArmorstand;
|
|
||||||
}
|
|
||||||
public BalloonEntity getBalloonEntity() {
|
|
||||||
return this.balloonEntity;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void addPlayerCosmetic(Cosmetic cosmetic) {
|
public void addPlayerCosmetic(Cosmetic cosmetic) {
|
||||||
addPlayerCosmetic(cosmetic, null);
|
addPlayerCosmetic(cosmetic, null);
|
||||||
}
|
}
|
||||||
@@ -127,13 +111,6 @@ public class CosmeticUser {
|
|||||||
spawnBalloon(balloonType);
|
spawnBalloon(balloonType);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public void toggleCosmetic(Cosmetic cosmetic) {
|
|
||||||
if (hasCosmeticInSlot(cosmetic.getSlot())) {
|
|
||||||
removeCosmeticSlot(cosmetic.getSlot());
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
addPlayerCosmetic(cosmetic);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void removeCosmetics() {
|
public void removeCosmetics() {
|
||||||
// Small optimization could be made, but Concurrent modification prevents us from both getting and removing
|
// Small optimization could be made, but Concurrent modification prevents us from both getting and removing
|
||||||
@@ -156,6 +133,9 @@ public class CosmeticUser {
|
|||||||
}
|
}
|
||||||
if (slot == CosmeticSlot.BALLOON) {
|
if (slot == CosmeticSlot.BALLOON) {
|
||||||
despawnBalloon();
|
despawnBalloon();
|
||||||
|
}
|
||||||
|
if (slot == CosmeticSlot.EMOTE) {
|
||||||
|
|
||||||
}
|
}
|
||||||
colors.remove(slot);
|
colors.remove(slot);
|
||||||
playerCosmetics.remove(slot);
|
playerCosmetics.remove(slot);
|
||||||
@@ -192,6 +172,7 @@ public class CosmeticUser {
|
|||||||
public ItemStack getUserCosmeticItem(Cosmetic cosmetic) {
|
public ItemStack getUserCosmeticItem(Cosmetic cosmetic) {
|
||||||
ItemStack item = null;
|
ItemStack item = null;
|
||||||
if (hideCosmetics) {
|
if (hideCosmetics) {
|
||||||
|
if (cosmetic instanceof CosmeticBackpackType || cosmetic instanceof CosmeticBalloonType) return new ItemStack(Material.AIR);
|
||||||
return getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmetic.getSlot()));
|
return getPlayer().getInventory().getItem(InventoryUtils.getEquipmentSlot(cosmetic.getSlot()));
|
||||||
}
|
}
|
||||||
if (cosmetic instanceof CosmeticArmorType || cosmetic instanceof CosmeticMainhandType || cosmetic instanceof CosmeticBackpackType) {
|
if (cosmetic instanceof CosmeticArmorType || cosmetic instanceof CosmeticMainhandType || cosmetic instanceof CosmeticBackpackType) {
|
||||||
@@ -210,9 +191,14 @@ public class CosmeticUser {
|
|||||||
}
|
}
|
||||||
if (item.hasItemMeta()) {
|
if (item.hasItemMeta()) {
|
||||||
ItemMeta itemMeta = item.getItemMeta();
|
ItemMeta itemMeta = item.getItemMeta();
|
||||||
if (itemMeta instanceof LeatherArmorMeta) {
|
if (colors.containsKey(cosmetic.getSlot())) {
|
||||||
if (colors.containsKey(cosmetic.getSlot())) {
|
Color color = colors.get(cosmetic.getSlot());
|
||||||
((LeatherArmorMeta) itemMeta).setColor(colors.get(cosmetic.getSlot()));
|
if (itemMeta instanceof LeatherArmorMeta leatherMeta) {
|
||||||
|
leatherMeta.setColor(color);
|
||||||
|
} else if (itemMeta instanceof PotionMeta potionMeta) {
|
||||||
|
potionMeta.setColor(color);
|
||||||
|
} else if (itemMeta instanceof MapMeta mapMeta) {
|
||||||
|
mapMeta.setColor(color);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
item.setItemMeta(itemMeta);
|
item.setItemMeta(itemMeta);
|
||||||
@@ -220,8 +206,32 @@ public class CosmeticUser {
|
|||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public UserBackpackManager getUserBackpackManager() {
|
||||||
|
return userBackpackManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserBalloonManager getBalloonManager() {
|
||||||
|
return this.userBalloonManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserWardrobeManager getWardrobeManager() {
|
||||||
|
return userWardrobeManager;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserEmoteManager getUserEmoteManager() {
|
||||||
|
return userEmoteManager;
|
||||||
|
}
|
||||||
|
|
||||||
public void enterWardrobe() {
|
public void enterWardrobe() {
|
||||||
if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation())) {
|
enterWardrobe(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void enterWardrobe(boolean ignoreDistance) {
|
||||||
|
enterWardrobe(ignoreDistance, WardrobeSettings.getLeaveLocation(), WardrobeSettings.getViewerLocation(), WardrobeSettings.getWardrobeLocation());
|
||||||
|
}
|
||||||
|
|
||||||
|
public void enterWardrobe(boolean ignoreDistance, Location exitLocation, Location viewingLocation, Location npcLocation) {
|
||||||
|
if (!WardrobeSettings.inDistanceOfStatic(getPlayer().getLocation()) && !ignoreDistance) {
|
||||||
MessagesUtil.sendMessage(getPlayer(), "not-near-wardrobe");
|
MessagesUtil.sendMessage(getPlayer(), "not-near-wardrobe");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -231,25 +241,21 @@ public class CosmeticUser {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (wardrobe == null) {
|
if (userWardrobeManager == null) {
|
||||||
wardrobe = new Wardrobe(this);
|
userWardrobeManager = new UserWardrobeManager(this, exitLocation, viewingLocation, npcLocation);
|
||||||
wardrobe.start();
|
userWardrobeManager.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public Wardrobe getWardrobe() {
|
|
||||||
return wardrobe;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void leaveWardrobe() {
|
public void leaveWardrobe() {
|
||||||
PlayerWardrobeLeaveEvent event = new PlayerWardrobeLeaveEvent(this);
|
PlayerWardrobeLeaveEvent event = new PlayerWardrobeLeaveEvent(this);
|
||||||
Bukkit.getPluginManager().callEvent(event);
|
Bukkit.getPluginManager().callEvent(event);
|
||||||
if (event.isCancelled()) {
|
if (event.isCancelled()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (!getWardrobe().getWardrobeStatus().equals(Wardrobe.WardrobeStatus.RUNNING)) return;
|
if (!getWardrobeManager().getWardrobeStatus().equals(UserWardrobeManager.WardrobeStatus.RUNNING)) return;
|
||||||
|
|
||||||
getWardrobe().setWardrobeStatus(Wardrobe.WardrobeStatus.STOPPING);
|
getWardrobeManager().setWardrobeStatus(UserWardrobeManager.WardrobeStatus.STOPPING);
|
||||||
|
|
||||||
if (WardrobeSettings.isEnabledTransition()) {
|
if (WardrobeSettings.isEnabledTransition()) {
|
||||||
MessagesUtil.sendTitle(
|
MessagesUtil.sendTitle(
|
||||||
@@ -260,16 +266,14 @@ public class CosmeticUser {
|
|||||||
WardrobeSettings.getTransitionFadeOut()
|
WardrobeSettings.getTransitionFadeOut()
|
||||||
);
|
);
|
||||||
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
Bukkit.getScheduler().runTaskLater(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
wardrobe.end();
|
userWardrobeManager.end();
|
||||||
wardrobe = null;
|
userWardrobeManager = null;
|
||||||
}, WardrobeSettings.getTransitionDelay());
|
}, WardrobeSettings.getTransitionDelay());
|
||||||
} else {
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isInWardrobe() {
|
public boolean isInWardrobe() {
|
||||||
if (wardrobe == null) return false;
|
if (userWardrobeManager == null) return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -282,45 +286,39 @@ public class CosmeticUser {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
|
public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
|
||||||
MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
|
this.userBackpackManager = new UserBackpackManager(this);
|
||||||
Player player = Bukkit.getPlayer(getUniqueId());
|
userBackpackManager.spawnBackpack(cosmeticBackpackType);
|
||||||
|
|
||||||
if (this.invisibleArmorstand != null) return;
|
|
||||||
|
|
||||||
this.invisibleArmorstand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(this, cosmeticBackpackType);
|
|
||||||
|
|
||||||
MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void despawnBackpack() {
|
||||||
|
if (userBackpackManager == null) return;
|
||||||
|
userBackpackManager.despawnBackpack();
|
||||||
|
userBackpackManager = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) {
|
public void spawnBalloon(CosmeticBalloonType cosmeticBalloonType) {
|
||||||
Player player = Bukkit.getPlayer(getUniqueId());
|
Player player = Bukkit.getPlayer(getUniqueId());
|
||||||
|
|
||||||
if (this.balloonEntity != null) return;
|
if (this.userBalloonManager != null) return;
|
||||||
|
|
||||||
this.balloonEntity = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType);
|
this.userBalloonManager = NMSHandlers.getHandler().spawnBalloon(this, cosmeticBalloonType);
|
||||||
|
|
||||||
List<Player> viewer = PlayerUtils.getNearbyPlayers(player);
|
List<Player> viewer = PlayerUtils.getNearbyPlayers(player);
|
||||||
viewer.add(player);
|
viewer.add(player);
|
||||||
|
|
||||||
PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), player.getEntityId(), viewer);
|
PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), player.getEntityId(), viewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void despawnBalloon() {
|
public void despawnBalloon() {
|
||||||
if (this.balloonEntity == null) return;
|
if (this.userBalloonManager == null) return;
|
||||||
List<Player> sentTo = PlayerUtils.getNearbyPlayers(getPlayer().getLocation());
|
List<Player> sentTo = PlayerUtils.getNearbyPlayers(getPlayer().getLocation());
|
||||||
|
|
||||||
PacketManager.sendEntityDestroyPacket(balloonEntity.getPufferfishBalloonId(), sentTo);
|
PacketManager.sendEntityDestroyPacket(userBalloonManager.getPufferfishBalloonId(), sentTo);
|
||||||
|
|
||||||
this.balloonEntity.remove();
|
this.userBalloonManager.remove();
|
||||||
this.balloonEntity = null;
|
this.userBalloonManager = null;
|
||||||
}
|
|
||||||
|
|
||||||
public void despawnBackpack() {
|
|
||||||
Player player = Bukkit.getPlayer(getUniqueId());
|
|
||||||
if (invisibleArmorstand == null) return;
|
|
||||||
invisibleArmorstand.setHealth(0);
|
|
||||||
invisibleArmorstand.remove();
|
|
||||||
this.invisibleArmorstand = null;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void respawnBackpack() {
|
public void respawnBackpack() {
|
||||||
@@ -383,24 +381,6 @@ public class CosmeticUser {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void hideBackpack() {
|
|
||||||
if (hideBackpack == true) return;
|
|
||||||
if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
|
||||||
invisibleArmorstand.getEquipment().clear();
|
|
||||||
hideBackpack = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void showBackpack() {
|
|
||||||
if (hideBackpack == false) return;
|
|
||||||
if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
|
||||||
CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
|
|
||||||
ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
|
|
||||||
invisibleArmorstand.getEquipment().setHelmet(item);
|
|
||||||
hideBackpack = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void hideCosmetics(HiddenReason reason) {
|
public void hideCosmetics(HiddenReason reason) {
|
||||||
if (hideCosmetics == true) return;
|
if (hideCosmetics == true) return;
|
||||||
PlayerCosmeticHideEvent event = new PlayerCosmeticHideEvent(this, reason);
|
PlayerCosmeticHideEvent event = new PlayerCosmeticHideEvent(this, reason);
|
||||||
@@ -412,12 +392,12 @@ public class CosmeticUser {
|
|||||||
hideCosmetics = true;
|
hideCosmetics = true;
|
||||||
hiddenReason = reason;
|
hiddenReason = reason;
|
||||||
if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
||||||
getBalloonEntity().removePlayerFromModel(getPlayer());
|
getBalloonManager().removePlayerFromModel(getPlayer());
|
||||||
List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
|
List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
|
||||||
PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), -1, viewer);
|
PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), -1, viewer);
|
||||||
}
|
}
|
||||||
if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
||||||
invisibleArmorstand.getEquipment().clear();
|
userBackpackManager.getArmorstand().getEquipment().clear();
|
||||||
}
|
}
|
||||||
updateCosmetic();
|
updateCosmetic();
|
||||||
MessagesUtil.sendDebugMessages("HideCosmetics");
|
MessagesUtil.sendDebugMessages("HideCosmetics");
|
||||||
@@ -436,14 +416,14 @@ public class CosmeticUser {
|
|||||||
hiddenReason = HiddenReason.NONE;
|
hiddenReason = HiddenReason.NONE;
|
||||||
if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
if (hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
||||||
CosmeticBalloonType balloonType = (CosmeticBalloonType) getCosmetic(CosmeticSlot.BALLOON);
|
CosmeticBalloonType balloonType = (CosmeticBalloonType) getCosmetic(CosmeticSlot.BALLOON);
|
||||||
getBalloonEntity().addPlayerToModel(this, balloonType);
|
getBalloonManager().addPlayerToModel(this, balloonType);
|
||||||
List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
|
List<Player> viewer = PlayerUtils.getNearbyPlayers(getPlayer());
|
||||||
PacketManager.sendLeashPacket(getBalloonEntity().getPufferfishBalloonId(), getPlayer().getEntityId(), viewer);
|
PacketManager.sendLeashPacket(getBalloonManager().getPufferfishBalloonId(), getPlayer().getEntityId(), viewer);
|
||||||
}
|
}
|
||||||
if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
if (hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
||||||
CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
|
CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) getCosmetic(CosmeticSlot.BACKPACK);
|
||||||
ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
|
ItemStack item = getUserCosmeticItem(cosmeticBackpackType);
|
||||||
invisibleArmorstand.getEquipment().setHelmet(item);
|
userBackpackManager.getArmorstand().getEquipment().setHelmet(item);
|
||||||
}
|
}
|
||||||
updateCosmetic();
|
updateCosmetic();
|
||||||
MessagesUtil.sendDebugMessages("ShowCosmetics");
|
MessagesUtil.sendDebugMessages("ShowCosmetics");
|
||||||
@@ -460,6 +440,10 @@ public class CosmeticUser {
|
|||||||
public enum HiddenReason {
|
public enum HiddenReason {
|
||||||
NONE,
|
NONE,
|
||||||
WORLDGUARD,
|
WORLDGUARD,
|
||||||
PLUGIN
|
PLUGIN,
|
||||||
|
POTION,
|
||||||
|
ACTION,
|
||||||
|
COMMAND,
|
||||||
|
EMOTE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,72 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.user.manager;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
||||||
|
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
|
import org.bukkit.entity.ArmorStand;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
public class UserBackpackManager {
|
||||||
|
|
||||||
|
private boolean hideBackpack;
|
||||||
|
private ArmorStand invisibleArmorstand;
|
||||||
|
private CosmeticUser user;
|
||||||
|
private BackpackType backpackType;
|
||||||
|
|
||||||
|
public UserBackpackManager(CosmeticUser user) {
|
||||||
|
this.user = user;
|
||||||
|
hideBackpack = false;
|
||||||
|
backpackType = BackpackType.NORMAL;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getFirstArmorstandId() {
|
||||||
|
return invisibleArmorstand.getEntityId();
|
||||||
|
}
|
||||||
|
|
||||||
|
public ArmorStand getArmorstand() {
|
||||||
|
return invisibleArmorstand;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void spawnBackpack(CosmeticBackpackType cosmeticBackpackType) {
|
||||||
|
MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Start");
|
||||||
|
|
||||||
|
if (this.invisibleArmorstand != null) return;
|
||||||
|
|
||||||
|
this.invisibleArmorstand = (ArmorStand) NMSHandlers.getHandler().spawnBackpack(user, cosmeticBackpackType);
|
||||||
|
|
||||||
|
|
||||||
|
MessagesUtil.sendDebugMessages("spawnBackpack Bukkit - Finish");
|
||||||
|
}
|
||||||
|
|
||||||
|
public void despawnBackpack() {
|
||||||
|
if (invisibleArmorstand == null) return;
|
||||||
|
invisibleArmorstand.setHealth(0);
|
||||||
|
invisibleArmorstand.remove();
|
||||||
|
this.invisibleArmorstand = null;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void hideBackpack() {
|
||||||
|
if (user.getHidden() == true) return;
|
||||||
|
getArmorstand().getEquipment().clear();
|
||||||
|
hideBackpack = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void showBackpack() {
|
||||||
|
if (hideBackpack == false) return;
|
||||||
|
CosmeticBackpackType cosmeticBackpackType = (CosmeticBackpackType) user.getCosmetic(CosmeticSlot.BACKPACK);
|
||||||
|
ItemStack item = user.getUserCosmeticItem(cosmeticBackpackType);
|
||||||
|
getArmorstand().getEquipment().setHelmet(item);
|
||||||
|
hideBackpack = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setVisibility(boolean shown) {
|
||||||
|
hideBackpack = shown;
|
||||||
|
}
|
||||||
|
|
||||||
|
public enum BackpackType {
|
||||||
|
NORMAL,
|
||||||
|
FIRST_PERSON // First person not yet implemented
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,6 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.entities;
|
package com.hibiscusmc.hmccosmetics.user.manager;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
import com.hibiscusmc.hmccosmetics.config.Settings;
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
||||||
@@ -18,14 +19,14 @@ import org.bukkit.util.Vector;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
public class BalloonEntity {
|
public class UserBalloonManager {
|
||||||
|
|
||||||
private BalloonType balloonType;
|
private BalloonType balloonType;
|
||||||
private final int balloonID;
|
private final int balloonID;
|
||||||
private final UUID uniqueID;
|
private final UUID uniqueID;
|
||||||
private final ArmorStand modelEntity;
|
private final ArmorStand modelEntity;
|
||||||
|
|
||||||
public BalloonEntity(Location location) {
|
public UserBalloonManager(Location location) {
|
||||||
this.uniqueID = UUID.randomUUID();
|
this.uniqueID = UUID.randomUUID();
|
||||||
this.balloonID = NMSHandlers.getHandler().getNextEntityId();
|
this.balloonID = NMSHandlers.getHandler().getNextEntityId();
|
||||||
this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));
|
this.modelEntity = NMSHandlers.getHandler().getMEGEntity(location.add(Settings.getBalloonOffset()));
|
||||||
@@ -33,7 +34,7 @@ public class BalloonEntity {
|
|||||||
|
|
||||||
public void spawnModel(CosmeticBalloonType cosmeticBalloonType, Color color) {
|
public void spawnModel(CosmeticBalloonType cosmeticBalloonType, Color color) {
|
||||||
// redo this
|
// redo this
|
||||||
if (cosmeticBalloonType.getModelName() != null) {
|
if (cosmeticBalloonType.getModelName() != null && HMCCosmeticsPlugin.hasModelEngine()) {
|
||||||
balloonType = BalloonType.MODELENGINE;
|
balloonType = BalloonType.MODELENGINE;
|
||||||
} else {
|
} else {
|
||||||
if (cosmeticBalloonType.getItem() != null) {
|
if (cosmeticBalloonType.getItem() != null) {
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.user.manager;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticEmoteType;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
|
|
||||||
|
public class UserEmoteManager {
|
||||||
|
|
||||||
|
CosmeticUser user;
|
||||||
|
private UserEmoteModel model;
|
||||||
|
|
||||||
|
public UserEmoteManager(CosmeticUser user) {
|
||||||
|
this.user = user;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void playEmote(CosmeticEmoteType cosmeticEmoteType) {
|
||||||
|
MessagesUtil.sendDebugMessages("playEmote " + cosmeticEmoteType.getAnimationId());
|
||||||
|
if (isPlayingEmote()) return;
|
||||||
|
if (user.isInWardrobe()) return;
|
||||||
|
try {
|
||||||
|
model = new UserEmoteModel(user);
|
||||||
|
model.playAnimation(cosmeticEmoteType.getAnimationId());
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isPlayingEmote() {
|
||||||
|
if (model == null) return false;
|
||||||
|
return model.isPlayingAnimation();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void stopEmote() {
|
||||||
|
if (!isPlayingEmote()) return;
|
||||||
|
model.stopAnimation();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,118 @@
|
|||||||
|
package com.hibiscusmc.hmccosmetics.user.manager;
|
||||||
|
|
||||||
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
|
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.ServerUtils;
|
||||||
|
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
||||||
|
import com.ticxo.playeranimator.api.model.player.PlayerModel;
|
||||||
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.GameMode;
|
||||||
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.Material;
|
||||||
|
import org.bukkit.entity.EntityType;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.inventory.EquipmentSlot;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.List;
|
||||||
|
import java.util.UUID;
|
||||||
|
|
||||||
|
public class UserEmoteModel extends PlayerModel {
|
||||||
|
|
||||||
|
private CosmeticUser user;
|
||||||
|
private String emotePlaying;
|
||||||
|
private int armorstandId;
|
||||||
|
private GameMode originalGamemode;
|
||||||
|
|
||||||
|
public UserEmoteModel(CosmeticUser user) {
|
||||||
|
super(user.getPlayer());
|
||||||
|
this.user = user;
|
||||||
|
armorstandId = NMSHandlers.getHandler().getNextEntityId();
|
||||||
|
getRangeManager().setRenderDistance(Settings.getViewDistance());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void playAnimation(String id) {
|
||||||
|
id = id + "." + id + "." + id; // Make into a format that playerAnimator works with. Requires 3 splits.
|
||||||
|
super.playAnimation(id);
|
||||||
|
emotePlaying = id;
|
||||||
|
// Add config option that either allows player to move or forces them into a spot.
|
||||||
|
Player player = user.getPlayer();
|
||||||
|
List<Player> viewer = List.of(user.getPlayer());
|
||||||
|
List<Player> outsideViewers = PacketManager.getViewers(player.getLocation());
|
||||||
|
outsideViewers.remove(player);
|
||||||
|
|
||||||
|
PacketManager.equipmentSlotUpdate(player, true, outsideViewers);
|
||||||
|
|
||||||
|
Location newLocation = player.getLocation().clone();
|
||||||
|
newLocation.setPitch(0);
|
||||||
|
double DISTANCE = Settings.getEmoteDistance();
|
||||||
|
Location thirdPersonLocation = newLocation.add(newLocation.getDirection().normalize().multiply(DISTANCE));
|
||||||
|
if (thirdPersonLocation.getBlock().getType() != Material.AIR) {
|
||||||
|
stopAnimation();
|
||||||
|
MessagesUtil.sendMessage(player, "emote-blocked");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
user.getPlayer().setInvisible(true);
|
||||||
|
user.hideCosmetics(CosmeticUser.HiddenReason.EMOTE);
|
||||||
|
|
||||||
|
originalGamemode = player.getGameMode();
|
||||||
|
|
||||||
|
PacketManager.sendEntitySpawnPacket(thirdPersonLocation, armorstandId, EntityType.ARMOR_STAND, UUID.randomUUID(), viewer);
|
||||||
|
PacketManager.sendInvisibilityPacket(armorstandId, viewer);
|
||||||
|
PacketManager.sendLookPacket(armorstandId, player.getLocation(), viewer);
|
||||||
|
|
||||||
|
PacketManager.gamemodeChangePacket(player, 3);
|
||||||
|
PacketManager.sendCameraPacket(armorstandId, viewer);
|
||||||
|
|
||||||
|
MessagesUtil.sendDebugMessages("playAnimation run");
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean update() {
|
||||||
|
if (super.getAnimationProperty() == null) {
|
||||||
|
stopAnimation();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
boolean update = (super.update() && isPlayingAnimation());
|
||||||
|
if (!update) {
|
||||||
|
stopAnimation();
|
||||||
|
}
|
||||||
|
return update;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void stopAnimation() {
|
||||||
|
emotePlaying = null;
|
||||||
|
despawn();
|
||||||
|
Bukkit.getScheduler().runTask(HMCCosmeticsPlugin.getInstance(), () -> {
|
||||||
|
if (user.getPlayer() == null) return;
|
||||||
|
Player player = user.getPlayer();
|
||||||
|
List<Player> viewer = List.of(user.getPlayer());
|
||||||
|
if (viewer == null) return;
|
||||||
|
List<Player> outsideViewers = PacketManager.getViewers(player.getLocation());
|
||||||
|
outsideViewers.remove(player);
|
||||||
|
|
||||||
|
int entityId = player.getEntityId();
|
||||||
|
PacketManager.sendCameraPacket(entityId, viewer);
|
||||||
|
PacketManager.sendEntityDestroyPacket(armorstandId, viewer);
|
||||||
|
if (this.originalGamemode != null) {
|
||||||
|
PacketManager.gamemodeChangePacket(player, ServerUtils.convertGamemode(this.originalGamemode));
|
||||||
|
player.setGameMode(this.originalGamemode);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (user.getPlayer() != null) player.setInvisible(false);
|
||||||
|
PacketManager.equipmentSlotUpdate(player, false, outsideViewers);
|
||||||
|
user.showPlayer();
|
||||||
|
user.showCosmetics();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean isPlayingAnimation() {
|
||||||
|
if (emotePlaying == null) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,10 +1,11 @@
|
|||||||
package com.hibiscusmc.hmccosmetics.user;
|
package com.hibiscusmc.hmccosmetics.user.manager;
|
||||||
|
|
||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
import com.hibiscusmc.hmccosmetics.config.Settings;
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
import com.hibiscusmc.hmccosmetics.cosmetic.CosmeticSlot;
|
||||||
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
import com.hibiscusmc.hmccosmetics.nms.NMSHandlers;
|
||||||
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
import com.hibiscusmc.hmccosmetics.util.ServerUtils;
|
import com.hibiscusmc.hmccosmetics.util.ServerUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
import com.hibiscusmc.hmccosmetics.util.packets.PacketManager;
|
||||||
@@ -26,7 +27,7 @@ import java.util.List;
|
|||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
import java.util.concurrent.atomic.AtomicInteger;
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
public class Wardrobe {
|
public class UserWardrobeManager {
|
||||||
|
|
||||||
private int NPC_ID;
|
private int NPC_ID;
|
||||||
private String npcName;
|
private String npcName;
|
||||||
@@ -41,11 +42,29 @@ public class Wardrobe {
|
|||||||
private boolean active;
|
private boolean active;
|
||||||
private WardrobeStatus wardrobeStatus;
|
private WardrobeStatus wardrobeStatus;
|
||||||
|
|
||||||
public Wardrobe(CosmeticUser user) {
|
public UserWardrobeManager(CosmeticUser user) {
|
||||||
NPC_ID = NMSHandlers.getHandler().getNextEntityId();
|
NPC_ID = NMSHandlers.getHandler().getNextEntityId();
|
||||||
ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
|
ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
|
||||||
WARDROBE_UUID = UUID.randomUUID();
|
WARDROBE_UUID = UUID.randomUUID();
|
||||||
VIEWER = user;
|
VIEWER = user;
|
||||||
|
|
||||||
|
exitLocation = WardrobeSettings.getLeaveLocation();
|
||||||
|
viewingLocation = WardrobeSettings.getViewerLocation();
|
||||||
|
npcLocation = WardrobeSettings.getWardrobeLocation();
|
||||||
|
|
||||||
|
wardrobeStatus = WardrobeStatus.SETUP;
|
||||||
|
}
|
||||||
|
|
||||||
|
public UserWardrobeManager(CosmeticUser user, Location exitLocation, Location viewingLocation, Location npcLocation) {
|
||||||
|
NPC_ID = NMSHandlers.getHandler().getNextEntityId();
|
||||||
|
ARMORSTAND_ID = NMSHandlers.getHandler().getNextEntityId();
|
||||||
|
WARDROBE_UUID = UUID.randomUUID();
|
||||||
|
VIEWER = user;
|
||||||
|
|
||||||
|
this.exitLocation = exitLocation;
|
||||||
|
this.viewingLocation = viewingLocation;
|
||||||
|
this.npcLocation = npcLocation;
|
||||||
|
|
||||||
wardrobeStatus = WardrobeStatus.SETUP;
|
wardrobeStatus = WardrobeStatus.SETUP;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -56,13 +75,8 @@ public class Wardrobe {
|
|||||||
this.originalGamemode = player.getGameMode();
|
this.originalGamemode = player.getGameMode();
|
||||||
if (WardrobeSettings.isReturnLastLocation()) {
|
if (WardrobeSettings.isReturnLastLocation()) {
|
||||||
this.exitLocation = player.getLocation().clone();
|
this.exitLocation = player.getLocation().clone();
|
||||||
} else {
|
|
||||||
this.exitLocation = WardrobeSettings.getLeaveLocation();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
viewingLocation = WardrobeSettings.getViewerLocation();
|
|
||||||
npcLocation = WardrobeSettings.getWardrobeLocation();
|
|
||||||
|
|
||||||
VIEWER.hidePlayer();
|
VIEWER.hidePlayer();
|
||||||
List<Player> viewer = List.of(player);
|
List<Player> viewer = List.of(player);
|
||||||
List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
|
List<Player> outsideViewers = PacketManager.getViewers(viewingLocation);
|
||||||
@@ -100,16 +114,16 @@ public class Wardrobe {
|
|||||||
|
|
||||||
// Misc
|
// Misc
|
||||||
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
||||||
PacketManager.ridingMountPacket(NPC_ID, VIEWER.getBackpackEntity().getEntityId(), viewer);
|
PacketManager.ridingMountPacket(NPC_ID, VIEWER.getUserBackpackManager().getFirstArmorstandId(), viewer);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
||||||
PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), -1, viewer);
|
PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), -1, viewer);
|
||||||
PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), NPC_ID, viewer); // This needs a possible fix
|
PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), NPC_ID, viewer); // This needs a possible fix
|
||||||
//PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer);
|
//PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer);
|
||||||
|
|
||||||
PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
|
PacketManager.sendTeleportPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
|
||||||
PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getModelId(), npcLocation.clone().add(Settings.getBalloonOffset()), false, viewer);
|
VIEWER.getBalloonManager().getModelEntity().teleport(npcLocation.clone().add(Settings.getBalloonOffset()));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WardrobeSettings.getEnabledBossbar()) {
|
if (WardrobeSettings.getEnabledBossbar()) {
|
||||||
@@ -157,7 +171,7 @@ public class Wardrobe {
|
|||||||
this.active = false;
|
this.active = false;
|
||||||
|
|
||||||
// NPC
|
// NPC
|
||||||
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), -1, viewer);
|
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getModelId(), -1, viewer);
|
||||||
PacketManager.sendEntityDestroyPacket(NPC_ID, viewer); // Success
|
PacketManager.sendEntityDestroyPacket(NPC_ID, viewer); // Success
|
||||||
PacketManager.sendRemovePlayerPacket(player, WARDROBE_UUID, viewer); // Success
|
PacketManager.sendRemovePlayerPacket(player, WARDROBE_UUID, viewer); // Success
|
||||||
|
|
||||||
@@ -209,7 +223,7 @@ public class Wardrobe {
|
|||||||
BukkitRunnable runnable = new BukkitRunnable() {
|
BukkitRunnable runnable = new BukkitRunnable() {
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
if (active == false) {
|
if (active == false || VIEWER.getPlayer() == null) {
|
||||||
MessagesUtil.sendDebugMessages("Active is false");
|
MessagesUtil.sendDebugMessages("Active is false");
|
||||||
this.cancel();
|
this.cancel();
|
||||||
return;
|
return;
|
||||||
@@ -226,9 +240,9 @@ public class Wardrobe {
|
|||||||
PacketManager.sendLookPacket(NPC_ID, location, viewer);
|
PacketManager.sendLookPacket(NPC_ID, location, viewer);
|
||||||
VIEWER.hidePlayer();
|
VIEWER.hidePlayer();
|
||||||
int rotationSpeed = WardrobeSettings.getRotationSpeed();
|
int rotationSpeed = WardrobeSettings.getRotationSpeed();
|
||||||
location.setYaw(getNextYaw(yaw - 30, rotationSpeed));
|
location.setYaw(ServerUtils.getNextYaw(yaw - 30, rotationSpeed));
|
||||||
PacketManager.sendRotationPacket(NPC_ID, location, true, viewer);
|
PacketManager.sendRotationPacket(NPC_ID, location, true, viewer);
|
||||||
int nextyaw = getNextYaw(yaw, rotationSpeed);
|
int nextyaw = ServerUtils.getNextYaw(yaw, rotationSpeed);
|
||||||
data.set(nextyaw);
|
data.set(nextyaw);
|
||||||
|
|
||||||
for (CosmeticSlot slot : CosmeticSlot.values()) {
|
for (CosmeticSlot slot : CosmeticSlot.values()) {
|
||||||
@@ -236,18 +250,18 @@ public class Wardrobe {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BACKPACK)) {
|
||||||
PacketManager.sendTeleportPacket(VIEWER.getArmorstandId(), location, false, viewer);
|
PacketManager.sendTeleportPacket(VIEWER.getUserBackpackManager().getFirstArmorstandId(), location, false, viewer);
|
||||||
PacketManager.ridingMountPacket(NPC_ID, VIEWER.getBackpackEntity().getEntityId(), viewer);
|
PacketManager.ridingMountPacket(NPC_ID, VIEWER.getUserBackpackManager().getFirstArmorstandId(), viewer);
|
||||||
VIEWER.getBackpackEntity().setRotation(nextyaw, 0);
|
VIEWER.getUserBackpackManager().getArmorstand().setRotation(nextyaw, 0);
|
||||||
PacketManager.sendEntityDestroyPacket(VIEWER.getArmorstandId(), outsideViewers);
|
PacketManager.sendEntityDestroyPacket(VIEWER.getUserBackpackManager().getFirstArmorstandId(), outsideViewers);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
if (VIEWER.hasCosmeticInSlot(CosmeticSlot.BALLOON)) {
|
||||||
PacketManager.sendTeleportPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
|
PacketManager.sendTeleportPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()), false, viewer);
|
||||||
VIEWER.getBalloonEntity().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
|
VIEWER.getBalloonManager().getModelEntity().teleport(WardrobeSettings.getWardrobeLocation().add(Settings.getBalloonOffset()));
|
||||||
PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getPufferfishBalloonId(), -1, outsideViewers);
|
PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), -1, outsideViewers);
|
||||||
PacketManager.sendEntityDestroyPacket(VIEWER.getBalloonEntity().getModelId(), outsideViewers);
|
PacketManager.sendEntityDestroyPacket(VIEWER.getBalloonManager().getModelId(), outsideViewers);
|
||||||
//PacketManager.sendLeashPacket(VIEWER.getBalloonEntity().getModelId(), NPC_ID, viewer); // Pufferfish goes away for some reason?
|
PacketManager.sendLeashPacket(VIEWER.getBalloonManager().getPufferfishBalloonId(), NPC_ID, viewer); // Pufferfish goes away for some reason?
|
||||||
}
|
}
|
||||||
|
|
||||||
if (WardrobeSettings.isEquipPumpkin()) {
|
if (WardrobeSettings.isEquipPumpkin()) {
|
||||||
@@ -259,15 +273,6 @@ public class Wardrobe {
|
|||||||
runnable.runTaskTimer(HMCCosmeticsPlugin.getInstance(), 0, 2);
|
runnable.runTaskTimer(HMCCosmeticsPlugin.getInstance(), 0, 2);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static int getNextYaw(final int current, final int rotationSpeed) {
|
|
||||||
int nextYaw = current + rotationSpeed;
|
|
||||||
if (nextYaw > 179) {
|
|
||||||
nextYaw = (current + rotationSpeed) - 358;
|
|
||||||
return nextYaw;
|
|
||||||
}
|
|
||||||
return nextYaw;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getArmorstandId() {
|
public int getArmorstandId() {
|
||||||
return ARMORSTAND_ID;
|
return ARMORSTAND_ID;
|
||||||
}
|
}
|
||||||
@@ -3,7 +3,8 @@ package com.hibiscusmc.hmccosmetics.util;
|
|||||||
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
import com.hibiscusmc.hmccosmetics.HMCCosmeticsPlugin;
|
||||||
import com.hibiscusmc.hmccosmetics.config.Settings;
|
import com.hibiscusmc.hmccosmetics.config.Settings;
|
||||||
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
import com.hibiscusmc.hmccosmetics.config.WardrobeSettings;
|
||||||
import com.hibiscusmc.hmccosmetics.hooks.PAPIHook;
|
import com.hibiscusmc.hmccosmetics.hooks.Hooks;
|
||||||
|
import com.hibiscusmc.hmccosmetics.hooks.placeholders.HMCPlaceholderExpansion;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
|
import com.hibiscusmc.hmccosmetics.util.misc.Adventure;
|
||||||
import me.clip.placeholderapi.PlaceholderAPI;
|
import me.clip.placeholderapi.PlaceholderAPI;
|
||||||
@@ -95,7 +96,7 @@ public class MessagesUtil {
|
|||||||
if (!messages.containsKey(key)) return null;
|
if (!messages.containsKey(key)) return null;
|
||||||
if (messages.get(key) == null) return null;
|
if (messages.get(key) == null) return null;
|
||||||
String message = messages.get(key);
|
String message = messages.get(key);
|
||||||
if (PAPIHook.isPAPIEnabled() && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
|
if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
|
||||||
message = message.replaceAll("%prefix%", prefix);
|
message = message.replaceAll("%prefix%", prefix);
|
||||||
if (placeholders != null ) {
|
if (placeholders != null ) {
|
||||||
return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
|
return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
|
||||||
@@ -113,7 +114,7 @@ public class MessagesUtil {
|
|||||||
|
|
||||||
public static Component processStringNoKey(Player player, String message, TagResolver placeholders) {
|
public static Component processStringNoKey(Player player, String message, TagResolver placeholders) {
|
||||||
message = message.replaceAll("%prefix%", prefix);
|
message = message.replaceAll("%prefix%", prefix);
|
||||||
if (PAPIHook.isPAPIEnabled() && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
|
if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
|
||||||
if (placeholders != null ) {
|
if (placeholders != null ) {
|
||||||
return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
|
return Adventure.MINI_MESSAGE.deserialize(message, placeholders);
|
||||||
}
|
}
|
||||||
@@ -122,7 +123,7 @@ public class MessagesUtil {
|
|||||||
|
|
||||||
public static String processStringNoKeyString(Player player, String message) {
|
public static String processStringNoKeyString(Player player, String message) {
|
||||||
message = message.replaceAll("%prefix%", prefix);
|
message = message.replaceAll("%prefix%", prefix);
|
||||||
if (PAPIHook.isPAPIEnabled() && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
|
if (Hooks.isActiveHook("PlaceholderAPI") && player != null) message = PlaceholderAPI.setPlaceholders(player, message);
|
||||||
return message;
|
return message;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -37,6 +37,16 @@ public class ServerUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static Color hex2Rgb(String colorStr) {
|
public static Color hex2Rgb(String colorStr) {
|
||||||
|
if (colorStr.startsWith("#")) return Color.fromRGB(Integer.valueOf(colorStr.substring(1), 16));
|
||||||
|
if (colorStr.startsWith("0x")) return Color.fromRGB(Integer.valueOf(colorStr.substring(2), 16));
|
||||||
|
if (colorStr.contains(",")) {
|
||||||
|
String[] colorString = colorStr.replace(" ", "").split(",");
|
||||||
|
for (String color : colorString) if (Integer.valueOf(color) == null) return Color.WHITE;
|
||||||
|
Color.fromRGB(Integer.valueOf(colorString[0]), Integer.valueOf(colorString[1]), Integer.valueOf(colorString[2]));
|
||||||
|
}
|
||||||
|
|
||||||
|
return Color.WHITE;
|
||||||
|
/* Old method
|
||||||
try {
|
try {
|
||||||
return Color.fromRGB(
|
return Color.fromRGB(
|
||||||
Integer.valueOf(colorStr.substring(1, 3), 16),
|
Integer.valueOf(colorStr.substring(1, 3), 16),
|
||||||
@@ -45,6 +55,7 @@ public class ServerUtils {
|
|||||||
} catch (StringIndexOutOfBoundsException e) {
|
} catch (StringIndexOutOfBoundsException e) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
// particle amount offsetxyz
|
// particle amount offsetxyz
|
||||||
@@ -126,4 +137,13 @@ public class ServerUtils {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static int getNextYaw(final int current, final int rotationSpeed) {
|
||||||
|
int nextYaw = current + rotationSpeed;
|
||||||
|
if (nextYaw > 179) {
|
||||||
|
nextYaw = (current + rotationSpeed) - 358;
|
||||||
|
return nextYaw;
|
||||||
|
}
|
||||||
|
return nextYaw;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,9 +16,12 @@ import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerPlayer
|
|||||||
import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerRelEntityMove;
|
import com.hibiscusmc.hmccosmetics.util.packets.wrappers.WrapperPlayServerRelEntityMove;
|
||||||
import it.unimi.dsi.fastutil.ints.IntArrayList;
|
import it.unimi.dsi.fastutil.ints.IntArrayList;
|
||||||
import org.bukkit.Location;
|
import org.bukkit.Location;
|
||||||
|
import org.bukkit.Material;
|
||||||
import org.bukkit.entity.Entity;
|
import org.bukkit.entity.Entity;
|
||||||
import org.bukkit.entity.EntityType;
|
import org.bukkit.entity.EntityType;
|
||||||
import org.bukkit.entity.Player;
|
import org.bukkit.entity.Player;
|
||||||
|
import org.bukkit.inventory.EquipmentSlot;
|
||||||
|
import org.bukkit.inventory.ItemStack;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Collections;
|
import java.util.Collections;
|
||||||
@@ -69,6 +72,17 @@ public class PacketManager extends BasePacket {
|
|||||||
for (Player p : sendTo) sendPacket(p, packet);
|
for (Player p : sendTo) sendPacket(p, packet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void equipmentSlotUpdate(
|
||||||
|
Player player,
|
||||||
|
boolean empty,
|
||||||
|
List<Player> sendTo
|
||||||
|
) {
|
||||||
|
for (EquipmentSlot slot : EquipmentSlot.values()) {
|
||||||
|
ItemStack item = player.getInventory().getItem(slot);
|
||||||
|
if (empty) item = new ItemStack(Material.AIR);
|
||||||
|
NMSHandlers.getHandler().equipmentSlotUpdate(player.getEntityId(), slot, item, sendTo);
|
||||||
|
}
|
||||||
|
}
|
||||||
public static void equipmentSlotUpdate(
|
public static void equipmentSlotUpdate(
|
||||||
Player player,
|
Player player,
|
||||||
CosmeticSlot cosmetic,
|
CosmeticSlot cosmetic,
|
||||||
@@ -91,7 +105,7 @@ public class PacketManager extends BasePacket {
|
|||||||
CosmeticSlot cosmeticSlot,
|
CosmeticSlot cosmeticSlot,
|
||||||
List<Player> sendTo
|
List<Player> sendTo
|
||||||
) {
|
) {
|
||||||
if (cosmeticSlot == CosmeticSlot.BACKPACK || cosmeticSlot == CosmeticSlot.BALLOON) return;
|
if (cosmeticSlot == CosmeticSlot.BACKPACK || cosmeticSlot == CosmeticSlot.BALLOON || cosmeticSlot == CosmeticSlot.EMOTE) return;
|
||||||
|
|
||||||
NMSHandlers.getHandler().equipmentSlotUpdate(entityId, user, cosmeticSlot, sendTo);
|
NMSHandlers.getHandler().equipmentSlotUpdate(entityId, user, cosmeticSlot, sendTo);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,9 @@ cosmetic-settings:
|
|||||||
# Ticking periods is something that ensures new players near a player get the packets to actually apply to the user.
|
# Ticking periods is something that ensures new players near a player get the packets to actually apply to the user.
|
||||||
|
|
||||||
unapply-on-death: false # If when a player dies, their cosmetics should be unapplied. If this is true, use hmccosmetics.unapplydeath.bypass to bypass
|
unapply-on-death: false # If when a player dies, their cosmetics should be unapplied. If this is true, use hmccosmetics.unapplydeath.bypass to bypass
|
||||||
|
force-permission-join: true # Checks a player permission if they can have a cosmetic when they join the server.
|
||||||
|
|
||||||
|
emote-distance: -3 # This shows how far away the camera should be while a player is doing an emote. Negative is behind player.
|
||||||
|
|
||||||
# view distance in blocks that other players will see the backpack cosmetic
|
# view distance in blocks that other players will see the backpack cosmetic
|
||||||
# setting this to lower than the server player view distance should fix the
|
# setting this to lower than the server player view distance should fix the
|
||||||
@@ -32,6 +35,8 @@ cosmetic-settings:
|
|||||||
y: 3
|
y: 3
|
||||||
z: 0.5
|
z: 0.5
|
||||||
dye-menu:
|
dye-menu:
|
||||||
|
# If you use ItemsAdder, set this to "§f:offset_-8::cosmetics_gui:"
|
||||||
|
# If you use Oraxen, set this to "<glyph:neg_shift_8><glyph:dye_menu>"
|
||||||
title: "§f"
|
title: "§f"
|
||||||
wardrobe:
|
wardrobe:
|
||||||
# spawn static wardrobe if in this radius of wardrobe-location
|
# spawn static wardrobe if in this radius of wardrobe-location
|
||||||
|
|||||||
@@ -87,9 +87,18 @@ boots:
|
|||||||
kite:
|
kite:
|
||||||
slot: BALLOON
|
slot: BALLOON
|
||||||
permission: "hmccosmetics.kite"
|
permission: "hmccosmetics.kite"
|
||||||
model: kite
|
model: kite # This is the ModelEngine model it will use. If you do not have ModelEngine installed, it will default to the item.
|
||||||
item:
|
item:
|
||||||
material: PAPER
|
material: PAPER
|
||||||
model-data: 7
|
model-data: 7
|
||||||
name: "<blue>Kite"
|
name: "<blue>Kite"
|
||||||
amount: 1
|
amount: 1
|
||||||
|
handstand:
|
||||||
|
slot: EMOTE
|
||||||
|
animation: handstand
|
||||||
|
meditate:
|
||||||
|
slot: EMOTE
|
||||||
|
animation: meditate
|
||||||
|
thinking:
|
||||||
|
slot: EMOTE
|
||||||
|
animation: thinking
|
||||||
@@ -132,4 +132,28 @@ items:
|
|||||||
- "<gray>Enabled: <#6D9DC5>%HMCCosmetics_equipped_kite%"
|
- "<gray>Enabled: <#6D9DC5>%HMCCosmetics_equipped_kite%"
|
||||||
- "<gray>Allowed: <#6D9DC5>%HMCCosmetics_unlocked_kite%"
|
- "<gray>Allowed: <#6D9DC5>%HMCCosmetics_unlocked_kite%"
|
||||||
type: cosmetic
|
type: cosmetic
|
||||||
cosmetic: kite
|
cosmetic: kite
|
||||||
|
handstand:
|
||||||
|
slots:
|
||||||
|
- 12
|
||||||
|
item:
|
||||||
|
material: PAPER
|
||||||
|
name: "<blue>Handstand Emote"
|
||||||
|
type: cosmetic
|
||||||
|
cosmetic: handstand
|
||||||
|
meditate:
|
||||||
|
slots:
|
||||||
|
- 13
|
||||||
|
item:
|
||||||
|
material: PAPER
|
||||||
|
name: "<blue>Meditate Emote"
|
||||||
|
type: cosmetic
|
||||||
|
cosmetic: meditate
|
||||||
|
thinking:
|
||||||
|
slots:
|
||||||
|
- 14
|
||||||
|
item:
|
||||||
|
material: PAPER
|
||||||
|
name: "<blue>Thinking Emote"
|
||||||
|
type: cosmetic
|
||||||
|
cosmetic: thinking
|
||||||
@@ -17,6 +17,9 @@ unequip-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>You have unequipped <cosme
|
|||||||
hide-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>Hidden cosmetics"
|
hide-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>Hidden cosmetics"
|
||||||
show-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>Revealed cosmetics!"
|
show-cosmetic: "%prefix% <gradient:#6D9DC5:#45CDE9>Revealed cosmetics!"
|
||||||
|
|
||||||
|
emote-blocked: "%prefix% <red>You can not use your emote here!"
|
||||||
|
emote-none: "%prefix% <red>You have no emote equipped!"
|
||||||
|
|
||||||
invalid-slot: "%prefix% <red>Invalid cosmetic slot!"
|
invalid-slot: "%prefix% <red>Invalid cosmetic slot!"
|
||||||
invalid-player: "%prefix% <red>Invalid Player!"
|
invalid-player: "%prefix% <red>Invalid Player!"
|
||||||
invalid-menu: "%prefix% <red>Invalid Menu!"
|
invalid-menu: "%prefix% <red>Invalid Menu!"
|
||||||
|
|||||||
674
license.md
Normal file
674
license.md
Normal file
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU Affero General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU General Public License from time to time. Such new versions will
|
||||||
|
be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
@@ -6,7 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
@@ -94,22 +94,22 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
||||||
Player player = user.getPlayer();
|
Player player = user.getPlayer();
|
||||||
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
||||||
|
|
||||||
BalloonEntity balloonEntity1 = new BalloonEntity(user.getPlayer().getLocation());
|
UserBalloonManager userBalloonManager1 = new UserBalloonManager(user.getPlayer().getLocation());
|
||||||
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
||||||
balloonEntity1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
userBalloonManager1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
||||||
|
|
||||||
balloonEntity1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
|
|
||||||
PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
|
PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
|
||||||
PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
|
PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
|
||||||
PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
||||||
|
|
||||||
return balloonEntity1;
|
return userBalloonManager1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
@@ -96,22 +96,22 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
||||||
Player player = user.getPlayer();
|
Player player = user.getPlayer();
|
||||||
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
||||||
|
|
||||||
BalloonEntity balloonEntity1 = new BalloonEntity(user.getPlayer().getLocation());
|
UserBalloonManager userBalloonManager1 = new UserBalloonManager(user.getPlayer().getLocation());
|
||||||
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
||||||
balloonEntity1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
userBalloonManager1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
||||||
|
|
||||||
balloonEntity1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
|
|
||||||
PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
|
PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
|
||||||
PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
|
PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
|
||||||
PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
||||||
|
|
||||||
return balloonEntity1;
|
return userBalloonManager1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
@@ -96,22 +96,22 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
||||||
Player player = user.getPlayer();
|
Player player = user.getPlayer();
|
||||||
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
||||||
|
|
||||||
BalloonEntity balloonEntity1 = new BalloonEntity(user.getPlayer().getLocation());
|
UserBalloonManager userBalloonManager1 = new UserBalloonManager(user.getPlayer().getLocation());
|
||||||
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
||||||
balloonEntity1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
userBalloonManager1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
||||||
|
|
||||||
balloonEntity1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
|
|
||||||
PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
|
PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
|
||||||
PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
|
PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
|
||||||
PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
||||||
|
|
||||||
return balloonEntity1;
|
return userBalloonManager1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticArmorType;
|
|||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBackpackType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticBalloonType;
|
||||||
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
import com.hibiscusmc.hmccosmetics.cosmetic.types.CosmeticMainhandType;
|
||||||
import com.hibiscusmc.hmccosmetics.entities.BalloonEntity;
|
import com.hibiscusmc.hmccosmetics.user.manager.UserBalloonManager;
|
||||||
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
import com.hibiscusmc.hmccosmetics.user.CosmeticUser;
|
||||||
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
import com.hibiscusmc.hmccosmetics.util.InventoryUtils;
|
||||||
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
import com.hibiscusmc.hmccosmetics.util.MessagesUtil;
|
||||||
@@ -96,22 +96,22 @@ public class NMSHandler implements com.hibiscusmc.hmccosmetics.nms.NMSHandler {
|
|||||||
|
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public BalloonEntity spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
public UserBalloonManager spawnBalloon(CosmeticUser user, CosmeticBalloonType cosmeticBalloonType) {
|
||||||
Player player = user.getPlayer();
|
Player player = user.getPlayer();
|
||||||
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
Location newLoc = player.getLocation().clone().add(Settings.getBalloonOffset());
|
||||||
|
|
||||||
BalloonEntity balloonEntity1 = new BalloonEntity(user.getPlayer().getLocation());
|
UserBalloonManager userBalloonManager1 = new UserBalloonManager(user.getPlayer().getLocation());
|
||||||
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
List<Player> sentTo = PlayerUtils.getNearbyPlayers(player.getLocation());
|
||||||
balloonEntity1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
userBalloonManager1.getModelEntity().teleport(user.getPlayer().getLocation().add(Settings.getBalloonOffset()));
|
||||||
|
|
||||||
balloonEntity1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.spawnModel(cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
balloonEntity1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
userBalloonManager1.addPlayerToModel(user, cosmeticBalloonType, user.getCosmeticColor(cosmeticBalloonType.getSlot()));
|
||||||
|
|
||||||
PacketManager.sendEntitySpawnPacket(newLoc, balloonEntity1.getPufferfishBalloonId(), EntityType.PUFFERFISH, balloonEntity1.getPufferfishBalloonUniqueId(), sentTo);
|
PacketManager.sendEntitySpawnPacket(newLoc, userBalloonManager1.getPufferfishBalloonId(), EntityType.PUFFERFISH, userBalloonManager1.getPufferfishBalloonUniqueId(), sentTo);
|
||||||
PacketManager.sendInvisibilityPacket(balloonEntity1.getPufferfishBalloonId(), sentTo);
|
PacketManager.sendInvisibilityPacket(userBalloonManager1.getPufferfishBalloonId(), sentTo);
|
||||||
PacketManager.sendLeashPacket(balloonEntity1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
PacketManager.sendLeashPacket(userBalloonManager1.getPufferfishBalloonId(), player.getEntityId(), sentTo);
|
||||||
|
|
||||||
return balloonEntity1;
|
return userBalloonManager1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user