Upstream
/
UltimateKits
mirror of https://github.com/songoda/UltimateKits.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

This commit is contained in:
Brianna 2020-03-22 03:35:28 -04:00
parent 153061ca6e 0b8982c2d6
commit 6958e8e83b
4 changed files with 30 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId>
<artifactId>UltimateKits</artifactId>
<modelVersion>4.0.0</modelVersion>
<version>2.5.1</version>
<version>2.5.2</version>
<build>
<defaultGoal>clean install</defaultGoal>
<finalName>UltimateKits-${project.version}</finalName>
@ -88,6 +88,10 @@
<id>private</id>
<url>http://repo.songoda.com/artifactory/private/</url>
</repository>
<repository>
<id>public</id>
<url>https://repo.songoda.com/artifactory/public/</url>
</repository>
<repository>
<id>spigot-repo</id>
<url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
@ -118,8 +122,8 @@
</dependency>
<dependency>
<groupId>bammerbom</groupId>
<artifactId>ultimatecore</artifactId>
<version>2.1.25</version>
<artifactId>UltimateCore</artifactId>
<version>2.1.26</version>
</dependency>
<dependency>
<groupId>com.zrips</groupId>

29
src/main/java/com/songoda/ultimatekits/gui/KitEditorGui.java
View File

@ -167,15 +167,12 @@ public class KitEditorGui extends DoubleGui {
ItemStack item2;
if (isInInventory) {
item2 = GuiUtils.createButtonItem(CompatibleMaterial.ITEM_FRAME,
plugin.getLocale().getMessage("interface.kiteditor.switchtokitfunctions").getMessage(),
plugin.getLocale().getMessage("interface.kiteditor.switchtokitfunctionslore").getMessage().split("\\|"));
} else {
item2 = GuiUtils.createButtonItem(CompatibleMaterial.ITEM_FRAME,
plugin.getLocale().getMessage("interface.kiteditor.switchtoinventory").getMessage(),
plugin.getLocale().getMessage("interface.kiteditor.switchtoinventorylore").getMessage().split("\\|"));
}
item2 = isInInventory ? GuiUtils.createButtonItem(CompatibleMaterial.ITEM_FRAME,
plugin.getLocale().getMessage("interface.kiteditor.switchtokitfunctions").getMessage(),
plugin.getLocale().getMessage("interface.kiteditor.switchtokitfunctionslore").getMessage().split("\\|"))
: GuiUtils.createButtonItem(CompatibleMaterial.ITEM_FRAME,
plugin.getLocale().getMessage("interface.kiteditor.switchtoinventory").getMessage(),
plugin.getLocale().getMessage("interface.kiteditor.switchtoinventorylore").getMessage().split("\\|"));
setButton(50, item2,
event -> {
@ -183,9 +180,7 @@ public class KitEditorGui extends DoubleGui {
restoreItemsInstance();
setPlayerActionForRange(0, 0, 3, 8, null);
setAcceptsItems(true);
setMainAction();
} else {
setMainAction();
saveItemsInstance();
setInvItems();
setAcceptsItems(false);
@ -194,18 +189,6 @@ public class KitEditorGui extends DoubleGui {
});
}
private void setMainAction() {
this.setPlayerActionForRange(0, 0, 3, 8, event -> {
Bukkit.getScheduler().runTaskLater(plugin, () -> {
if (isInInventory)
stash = player.getInventory().getContents().clone();
}, 0L);
if (!isInInventory && event.player.getItemOnCursor().getType() != Material.AIR) {
event.event.setCancelled(true);
}
});
}
private void saveItemsInstance() {
setPlayerUnlockedRange(0, 0, 3, 8, false);
stash = player.getInventory().getContents().clone();

17
src/main/java/com/songoda/ultimatekits/gui/KitGeneralOptionsGui.java
View File

@ -47,16 +47,13 @@ public class KitGeneralOptionsGui extends Gui {
gui.setTitle(plugin.getLocale().getMessage("interface.kitoptions.delayprompt").getMessage());
gui.setAction(aevent -> {
final String msg = gui.getInputText();
final String num = msg != null ? msg.replaceAll("[^0-9]", "") : "";
if (!num.isEmpty()) {
try {
kit.setDelay(Integer.parseInt(num.trim()));
updateItemLore(event.slot, plugin.getLocale().getMessage("interface.kitoptions.delaylore")
.processPlaceholder("delay", kit.getDelay()).getMessage().split("\\|"));
aevent.player.closeInventory();
return;
} catch (NumberFormatException e) {
}
try {
kit.setDelay(Integer.parseInt(msg));
updateItemLore(event.slot, plugin.getLocale().getMessage("interface.kitoptions.delaylore")
.processPlaceholder("delay", kit.getDelay()).getMessage().split("\\|"));
aevent.player.closeInventory();
return;
} catch (NumberFormatException e) {
}
plugin.getLocale().getMessage("interface.kitoptions.delaynonumber").processPlaceholder("input", msg).sendPrefixedMessage(player);
});

18
src/main/java/com/songoda/ultimatekits/handlers/DisplayItemHandler.java
View File

@ -29,7 +29,7 @@ public class DisplayItemHandler {
}
public void start() {
Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(UltimateKits.getInstance(), this::displayItems, 30L, 30L);
Bukkit.getServer().getScheduler().runTaskTimerAsynchronously(instance, this::displayItems, 30L, 30L);
}
private void displayItems() {
@ -81,12 +81,14 @@ public class DisplayItemHandler {
ItemMeta meta = is.getItemMeta();
meta.setDisplayName(TextUtils.convertFromInvisibleString("0"));
is.setItemMeta(meta);
Item item = location.getWorld().dropItem(location.add(0, 1, 0), list.get(0));
Vector vec = new Vector(0, 0, 0);
item.setVelocity(vec);
item.setPickupDelay(9999);
item.setMetadata("US_EXEMPT", new FixedMetadataValue(UltimateKits.getInstance(), true));
item.setMetadata("displayItem", new FixedMetadataValue(UltimateKits.getInstance(), true));
item.setMetadata("betterdrops_ignore", new FixedMetadataValue(UltimateKits.getInstance(), true));
Bukkit.getScheduler().runTask(instance, () -> {
Item item = location.getWorld().dropItem(location.add(0, 1, 0), list.get(0));
Vector vec = new Vector(0, 0, 0);
item.setVelocity(vec);
item.setPickupDelay(9999);
item.setMetadata("US_EXEMPT", new FixedMetadataValue(UltimateKits.getInstance(), true));
item.setMetadata("displayItem", new FixedMetadataValue(UltimateKits.getInstance(), true));
item.setMetadata("betterdrops_ignore", new FixedMetadataValue(UltimateKits.getInstance(), true));
});
}
}