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

3.18.6.1

Browse Source
This commit is contained in:
rockyhawk64 2023-03-28 17:01:26 +11:00
parent aa8722513f
commit 7eca5d2451
19 changed files with 224 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
.idea/jarRepositories.xml
View File

@ -31,6 +31,11 @@
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="ess-repo" />
<option name="name" value="ess-repo" />
<option name="url" value="http://repo.ess3.net/content/groups/essentials" />
</remote-repository>
<remote-repository>
<option name="id" value="BenCodez Repo" />
<option name="name" value="BenCodez Repo" />
@ -51,6 +56,11 @@
<option name="name" value="jitpack-repo" />
<option name="url" value="https://jitpack.io" />
</remote-repository>
<remote-repository>
<option name="id" value="ess-repo" />
<option name="name" value="ess-repo" />
<option name="url" value="https://repo.essentialsx.net/releases/" />
</remote-repository>
<remote-repository>
<option name="id" value="spigot-repo" />
<option name="name" value="spigot-repo" />
@ -61,6 +71,11 @@
<option name="name" value="vault" />
<option name="url" value="https://dev.bukkit.org/projects/vault" />
</remote-repository>
<remote-repository>
<option name="id" value="ess-repo" />
<option name="name" value="ess-repo" />
<option name="url" value="https://repo.ess3.net/content/groups/essentials" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />

13
.idea/libraries/Maven__io_leangen_geantyref_geantyref_1_3_11.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.leangen.geantyref:geantyref:1.3.11">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/leangen/geantyref/geantyref/1.3.11/geantyref-1.3.11.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/leangen/geantyref/geantyref/1.3.11/geantyref-1.3.11-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/leangen/geantyref/geantyref/1.3.11/geantyref-1.3.11-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__io_lumine_MythicLib_dist_1_5_1_SNAPSHOT.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.lumine:MythicLib-dist:1.5.1-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/MythicLib-dist/1.5.1-SNAPSHOT/MythicLib-dist-1.5.1-20230321.140549-5.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/MythicLib-dist/1.5.1-SNAPSHOT/MythicLib-dist-1.5.1-20230324.231231-6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/MythicLib-dist/1.5.1-SNAPSHOT/MythicLib-dist-1.5.1-20230321.140549-5-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/MythicLib-dist/1.5.1-SNAPSHOT/MythicLib-dist-1.5.1-20230324.231231-6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/MythicLib-dist/1.5.1-SNAPSHOT/MythicLib-dist-1.5.1-20230321.140549-5-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/io/lumine/MythicLib-dist/1.5.1-SNAPSHOT/MythicLib-dist-1.5.1-20230324.231231-6-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__io_papermc_paperlib_1_0_6.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: io.papermc:paperlib:1.0.6">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/io/papermc/paperlib/1.0.6/paperlib-1.0.6.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/io/papermc/paperlib/1.0.6/paperlib-1.0.6-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/io/papermc/paperlib/1.0.6/paperlib-1.0.6-sources.jar!/" />
</SOURCES>
</library>
</component>

6
.idea/libraries/Maven__net_Indyuce_MMOItems_API_6_9_2_SNAPSHOT.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.Indyuce:MMOItems-API:6.9.2-SNAPSHOT">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/Indyuce/MMOItems-API/6.9.2-SNAPSHOT/MMOItems-API-6.9.2-20230319.132511-1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/Indyuce/MMOItems-API/6.9.2-SNAPSHOT/MMOItems-API-6.9.2-20230324.230733-5.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/Indyuce/MMOItems-API/6.9.2-SNAPSHOT/MMOItems-API-6.9.2-20230319.132511-1-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/Indyuce/MMOItems-API/6.9.2-SNAPSHOT/MMOItems-API-6.9.2-20230324.230733-5-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/Indyuce/MMOItems-API/6.9.2-SNAPSHOT/MMOItems-API-6.9.2-20230319.132511-1-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/net/Indyuce/MMOItems-API/6.9.2-SNAPSHOT/MMOItems-API-6.9.2-20230324.230733-5-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_essentialsx_1_12Provider_2_19_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.essentialsx:1_12Provider:2.19.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/1_12Provider/2.19.7/1_12Provider-2.19.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/1_12Provider/2.19.7/1_12Provider-2.19.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/1_12Provider/2.19.7/1_12Provider-2.19.7-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_essentialsx_1_8Provider_2_19_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.essentialsx:1_8Provider:2.19.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/1_8Provider/2.19.7/1_8Provider-2.19.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/1_8Provider/2.19.7/1_8Provider-2.19.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/1_8Provider/2.19.7/1_8Provider-2.19.7-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_essentialsx_BaseProviders_2_19_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.essentialsx:BaseProviders:2.19.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/BaseProviders/2.19.7/BaseProviders-2.19.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/BaseProviders/2.19.7/BaseProviders-2.19.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/BaseProviders/2.19.7/BaseProviders-2.19.7-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_essentialsx_EssentialsX_2_19_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.essentialsx:EssentialsX:2.19.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/EssentialsX/2.19.7/EssentialsX-2.19.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/EssentialsX/2.19.7/EssentialsX-2.19.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/EssentialsX/2.19.7/EssentialsX-2.19.7-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_essentialsx_NMSReflectionProvider_2_19_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.essentialsx:NMSReflectionProvider:2.19.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/NMSReflectionProvider/2.19.7/NMSReflectionProvider-2.19.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/NMSReflectionProvider/2.19.7/NMSReflectionProvider-2.19.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/NMSReflectionProvider/2.19.7/NMSReflectionProvider-2.19.7-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__net_essentialsx_PaperProvider_2_19_7.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: net.essentialsx:PaperProvider:2.19.7">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/PaperProvider/2.19.7/PaperProvider-2.19.7.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/PaperProvider/2.19.7/PaperProvider-2.19.7-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/net/essentialsx/PaperProvider/2.19.7/PaperProvider-2.19.7-sources.jar!/" />
</SOURCES>
</library>
</component>

8
.idea/libraries/Maven__org_checkerframework_checker_qual_3_12_0.xml → .idea/libraries/Maven__org_checkerframework_checker_qual_3_14_0.xml
View File

@ -1,13 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.checkerframework:checker-qual:3.12.0">
<library name="Maven: org.checkerframework:checker-qual:3.14.0">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.14.0/checker-qual-3.14.0.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0-javadoc.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.14.0/checker-qual-3.14.0-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.12.0/checker-qual-3.12.0-sources.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.14.0/checker-qual-3.14.0-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_spongepowered_configurate_core_4_1_2.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.spongepowered:configurate-core:4.1.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spongepowered/configurate-core/4.1.2/configurate-core-4.1.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spongepowered/configurate-core/4.1.2/configurate-core-4.1.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spongepowered/configurate-core/4.1.2/configurate-core-4.1.2-sources.jar!/" />
</SOURCES>
</library>
</component>

13
.idea/libraries/Maven__org_spongepowered_configurate_yaml_4_1_2.xml Normal file
View File

@ -0,0 +1,13 @@
<component name="libraryTable">
<library name="Maven: org.spongepowered:configurate-yaml:4.1.2">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/spongepowered/configurate-yaml/4.1.2/configurate-yaml-4.1.2.jar!/" />
</CLASSES>
<JAVADOC>
<root url="jar://$MAVEN_REPOSITORY$/org/spongepowered/configurate-yaml/4.1.2/configurate-yaml-4.1.2-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
<root url="jar://$MAVEN_REPOSITORY$/org/spongepowered/configurate-yaml/4.1.2/configurate-yaml-4.1.2-sources.jar!/" />
</SOURCES>
</library>
</component>

12
CommandPanels.iml
View File

@ -24,7 +24,6 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:31.1-jre" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:failureaccess:1.0.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.12.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.errorprone:error_prone_annotations:2.11.0" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.j2objc:j2objc-annotations:1.3" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.10" level="project" />
@ -67,5 +66,16 @@
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Realizedd:TokenManager:3.2.4" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.arcaniax:HeadDatabase-API:1.3.1" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: com.github.Ssomar-Developement:SCore:3.9.43" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:EssentialsX:2.19.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.6" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:BaseProviders:2.19.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:PaperProvider:2.19.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:NMSReflectionProvider:2.19.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:1_8Provider:2.19.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: net.essentialsx:1_12Provider:2.19.7" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spongepowered:configurate-yaml:4.1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.spongepowered:configurate-core:4.1.2" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: io.leangen.geantyref:geantyref:1.3.11" level="project" />
<orderEntry type="library" scope="PROVIDED" name="Maven: org.checkerframework:checker-qual:3.14.0" level="project" />
</component>
</module>

12
pom.xml
View File

@ -83,6 +83,10 @@
<id>BenCodez Repo</id>
<url>https://nexus.bencodez.com/repository/maven-public/</url>
</repository>
<repository>
<id>ess-repo</id>
<url>https://repo.essentialsx.net/releases/</url>
</repository>
<repository>
<id>placeholderapi</id>
<url>https://repo.extendedclip.com/content/repositories/placeholderapi/</url>
@ -136,7 +140,7 @@
<dependency>
<groupId>me.clip</groupId>
<artifactId>placeholderapi</artifactId>
<version>LATEST</version>
<version>2.11.3</version>
<scope>provided</scope>
</dependency>
<dependency>
@ -181,5 +185,11 @@
<version>LATEST</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>net.essentialsx</groupId>
<artifactId>EssentialsX</artifactId>
<version>2.19.7</version>
<scope>provided</scope>
</dependency>
</dependencies>
</project>

4
resource/plugin.yml
View File

@ -1,10 +1,10 @@
version: 3.18.6.0
version: 3.18.6.1
main: me.rockyhawk.commandpanels.CommandPanels
name: CommandPanels
author: RockyHawk
api-version: '1.13'
description: Fully Custom GUIs. Make your Server Professional.
softdepend: [PlaceholderAPI, Vault, HeadDatabase, TokenManager, VotingPlugin, MMOItems, ChestSort]
softdepend: [Essentials, PlaceholderAPI, Vault, HeadDatabase, TokenManager, VotingPlugin, MMOItems, ChestSort]
commands:
commandpanel:
description: Open a command panel.

51
src/me/rockyhawk/commandpanels/classresources/placeholders/Placeholders.java
View File

@ -1,6 +1,7 @@
package me.rockyhawk.commandpanels.classresources.placeholders;
import com.bencodez.votingplugin.user.UserManager;
import com.earth2me.essentials.Essentials;
import me.realized.tokenmanager.api.TokenManager;
import me.rockyhawk.commandpanels.CommandPanels;
import me.rockyhawk.commandpanels.api.Panel;
@ -14,9 +15,7 @@ import org.bukkit.inventory.meta.Damageable;
import java.io.IOException;
import java.net.InetSocketAddress;
import java.net.Socket;
import java.util.ArrayList;
import java.util.List;
import java.util.Objects;
import java.util.*;
import java.util.stream.Collectors;
public class Placeholders {
@ -97,8 +96,14 @@ public class Placeholders {
return Integer.toString(Bukkit.getServer().getOnlinePlayers().size());
}
case("online-players-visible"): {
//will filter out players with metadata 'vanished'
return Integer.toString(Bukkit.getOnlinePlayers().stream().filter(player -> !player.getMetadata("vanished").get(0).asBoolean()).collect(Collectors.toList()).size());
//will not include players that are vanished
int count = 0;
for(Player temp : Bukkit.getOnlinePlayers()) {
if(!isPlayerVanished(temp)) {
count++;
}
}
return Integer.toString(count);
}
case("panel-position"): {
return position.toString();
@ -328,17 +333,27 @@ public class Placeholders {
if(identifier.startsWith("player-online-")) {
try {
String playerLocation = identifier.replace("player-online-", "");
Player[] playerFind;
if (identifier.endsWith("-visible")){
playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().stream().filter(player -> !player.getMetadata("vanished").get(0).asBoolean()).collect(Collectors.toList()).size()]);
} else {
playerFind = Bukkit.getOnlinePlayers().toArray(new Player[Bukkit.getOnlinePlayers().size()]);
//for players that are visible only
//remove -visible from the end of playerLocation
playerLocation = playerLocation.replace("-visible", "");
List<Player> playerList = new ArrayList<>();
for(Player temp : Bukkit.getOnlinePlayers()) {
if(!isPlayerVanished(temp)) {
playerList.add(temp);
}
if (Double.parseDouble(playerLocation) > playerFind.length) {
}
if(playerList.size() >= Integer.parseInt(playerLocation)){
return playerList.get(Integer.parseInt(playerLocation)-1).getName();
}
} else {
//for every player whether they are visible or not
if(Bukkit.getOnlinePlayers().toArray().length >= Integer.parseInt(playerLocation)){
return ((Player)Bukkit.getOnlinePlayers().toArray()[Integer.parseInt(playerLocation)-1]).getName();
}
}
//player is not found
return plugin.tex.colour(Objects.requireNonNull(plugin.config.getString("config.format.offline")));
} else {
return playerFind[(int)(Double.parseDouble(playerLocation) - 1)].getName();
}
}catch (Exception ex){
plugin.debug(ex,p);
return "";
@ -369,4 +384,14 @@ public class Placeholders {
//end nodes with PlaceHolders
return "";
}
public boolean isPlayerVanished(Player player) {
//check if EssentialsX exists
if(!Bukkit.getPluginManager().isPluginEnabled("Essentials")) {
return false;
}
//check if player is vanished using essentials
Essentials essentials = (Essentials)Bukkit.getPluginManager().getPlugin("Essentials");
return essentials.getUser(player).isVanished();
}
}

8
src/me/rockyhawk/commandpanels/ioclasses/legacy/MinecraftVersions.java
View File

@ -14,7 +14,13 @@ public enum MinecraftVersions {
v1_18( "1_18", 10 ),
v1_19( "1_19", 11 ),
v1_20( "1_20", 12 ),
v1_21( "1_21", 13 );
v1_21( "1_21", 13 ),
v1_22( "1_22", 14 ),
v1_23( "1_23", 15 ),
v1_24( "1_24", 16 ),
v1_25( "1_25", 17 ),
v1_26( "1_26", 18 );
private int order;
private String key;