forked from Upstream/CommandPanels
v3.14.4.5
This commit is contained in:
parent
ccface1e98
commit
da29469afe
9
.idea/libraries/CustomItemsAPI_PLACEHOLDER.xml
Normal file
9
.idea/libraries/CustomItemsAPI_PLACEHOLDER.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<component name="libraryTable">
|
||||
<library name="CustomItemsAPI_PLACEHOLDER">
|
||||
<CLASSES>
|
||||
<root url="jar://$PROJECT_DIR$/../../Tools/Build Tools/Jar Libraries/CustomItemsAPI_PLACEHOLDER.jar!/" />
|
||||
</CLASSES>
|
||||
<JAVADOC />
|
||||
<SOURCES />
|
||||
</library>
|
||||
</component>
|
@ -17,5 +17,6 @@
|
||||
<orderEntry type="library" name="MMOLib" level="project" />
|
||||
<orderEntry type="library" name="spigot-1.16.4" level="project" />
|
||||
<orderEntry type="library" name="spigot-1.13.2" level="project" />
|
||||
<orderEntry type="library" name="CustomItemsAPI_PLACEHOLDER" level="project" />
|
||||
</component>
|
||||
</module>
|
@ -1,10 +1,10 @@
|
||||
version: 3.14.4.4
|
||||
version: 3.14.4.5
|
||||
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]
|
||||
softdepend: [PlaceholderAPI, Vault, HeadDatabase, TokenManager, VotingPlugin, MMOItems, CustomItems]
|
||||
commands:
|
||||
commandpanel:
|
||||
description: Open a command panel.
|
||||
|
@ -179,7 +179,13 @@ public class CommandTags {
|
||||
new BukkitRunnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
try {
|
||||
commandTags(p, finalCommand, commandRAW);
|
||||
}catch (Exception ex){
|
||||
//if there are any errors, cancel so that it doesn't loop errors
|
||||
plugin.debug(ex);
|
||||
this.cancel();
|
||||
}
|
||||
this.cancel();
|
||||
}
|
||||
}.runTaskTimer(plugin, 20*delaySeconds, 20); //20 ticks == 1 second
|
||||
|
@ -1,5 +1,6 @@
|
||||
package me.rockyhawk.commandpanels.classresources;
|
||||
|
||||
import com.jojodmo.customitems.api.CustomItemsAPI;
|
||||
import me.arcaniax.hdb.api.HeadDatabaseAPI;
|
||||
import me.rockyhawk.commandpanels.CommandPanels;
|
||||
import me.rockyhawk.commandpanels.ioclasses.NBTEditor;
|
||||
@ -95,7 +96,7 @@ public class ItemCreation {
|
||||
}
|
||||
}
|
||||
|
||||
//create custom MMOItems item
|
||||
//creates custom MMOItems items
|
||||
if(matraw.split("\\s")[0].toLowerCase().equals("mmo=") && plugin.getServer().getPluginManager().isPluginEnabled("MMOItems")){
|
||||
String itemType = matraw.split("\\s")[1];
|
||||
String itemID = matraw.split("\\s")[2];
|
||||
@ -105,6 +106,12 @@ public class ItemCreation {
|
||||
normalCreation = false;
|
||||
}
|
||||
|
||||
//creates Custom Items items
|
||||
if(matraw.split("\\s")[0].toLowerCase().equals("cui=") && plugin.getServer().getPluginManager().isPluginEnabled("CustomItems")){
|
||||
s = CustomItemsAPI.getCustomItem("cui:" + matraw.split("\\s")[1]);
|
||||
normalCreation = false;
|
||||
}
|
||||
|
||||
if(normalCreation) {
|
||||
s = new ItemStack(Objects.requireNonNull(Material.matchMaterial(mat)), 1, id);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user