Upstream/UltimateKits
1
0
Fork 0
mirror of https://github.com/songoda/UltimateKits.git synced 2024-12-01 22:53:47 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development'

Browse Source
This commit is contained in:
Fernando Pettinelli 2021-01-19 21:58:41 -03:00
commit b7e021aa05
4 changed files with 9 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -2,7 +2,7 @@
<groupId>com.songoda</groupId> <groupId>com.songoda</groupId>
<artifactId>UltimateKits</artifactId> <artifactId>UltimateKits</artifactId>
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<version>2.6.12b</version> <version>2.6.13</version>
<build> <build>
<defaultGoal>clean install</defaultGoal> <defaultGoal>clean install</defaultGoal>
<finalName>UltimateKits-${project.version}</finalName> <finalName>UltimateKits-${project.version}</finalName>

22
src/main/java/com/songoda/ultimatekits/gui/AnimatedKitGui.java
View File

@ -72,7 +72,7 @@ public class AnimatedKitGui extends Gui {
int updatesPerSlow = 6; int updatesPerSlow = 6;
if (++updateTick >= updatesPerSlow) { if (++updateTick >= updatesPerSlow) {
updateTick = 0; updateTick = 0;
int ticksPerUpdateSlow = 10; int ticksPerUpdateSlow = Settings.ROULETTE_LENGTH_MULTIPLIER.getInt();
if (++ticksPerUpdate >= ticksPerUpdateSlow) { if (++ticksPerUpdate >= ticksPerUpdateSlow) {
finish = true; finish = true;
} }
@ -92,17 +92,17 @@ public class AnimatedKitGui extends Gui {
items.removeLast(); items.removeLast();
Iterator<KitItem> itemIter = items.iterator(); Iterator<KitItem> itemIter = items.iterator();
for (int i = 9; i < 18; i++) { for (int i = 9; i < 18; i++) {
setItem(0, i, itemIter.next().getItemForDisplay()); setItem(0, i, itemIter.next().getItem());
} }
} }
// should we try to wrap it up? // should we try to wrap it up?
if (finish) { if (finish) {
ItemStack item = getItem(13); ItemStack item = getItem(13);
KitItem kitItem = items.stream().filter(i -> isSimilar(item, i)).findFirst().orElse(null); KitItem kitItem = items.stream().filter(i -> i.getItem().isSimilar(item)).findFirst().orElse(null);
if (item == null) { if (item == null) {
done = true; // idk. done = true; // idk.
} else if (isSimilar(give, kitItem)) { } else if (item.isSimilar(give)) {
if (!done) { if (!done) {
done = true; done = true;
if (!Settings.AUTO_EQUIP_ARMOR_ROULETTE.getBoolean() || !ArmorType.equip(player, give)) { if (!Settings.AUTO_EQUIP_ARMOR_ROULETTE.getBoolean() || !ArmorType.equip(player, give)) {
@ -129,20 +129,6 @@ public class AnimatedKitGui extends Gui {
} }
private boolean isSimilar(ItemStack item, KitItem kitItem) {
if (kitItem == null) return false;
switch (kitItem.getType()) {
case COMMAND:
case ECONOMY:
System.out.println("1 " + item.getItemMeta().getLore());
System.out.println("2 " + kitItem.getItemForDisplay().getItemMeta().getLore());
System.out.println(item.getItemMeta().getLore().get(0).equals(kitItem.getItemForDisplay().getItemMeta().getLore()));
return item.getItemMeta().getLore().get(0).equals(kitItem.getItemForDisplay().getItemMeta().getLore());
default:
return item.isSimilar(kitItem.getItemForDisplay());
}
}
private void finish() { private void finish() {
Bukkit.getScheduler().cancelTask(task); Bukkit.getScheduler().cancelTask(task);
exit(); exit();

2
src/main/java/com/songoda/ultimatekits/kit/Kit.java
View File

@ -327,7 +327,7 @@ public class Kit {
if (kitAnimation != KitAnimation.NONE) { if (kitAnimation != KitAnimation.NONE) {
// TODO: this is a very bad way to solve this problem. // TODO: this is a very bad way to solve this problem.
// Giving the player kit rewards really should be done outside of the Kit class. // Giving the player kit rewards really should be done outside of the Kit class.
plugin.getGuiManager().showGUI(player, new AnimatedKitGui(plugin, player, this, item.getItemForDisplay())); plugin.getGuiManager().showGUI(player, new AnimatedKitGui(plugin, player, this, item.getItem()));
return true; return true;
} else { } else {
ItemStack parseStack = item.getContent().process(player); ItemStack parseStack = item.getContent().process(player);

3
src/main/java/com/songoda/ultimatekits/settings/Settings.java
View File

@ -24,6 +24,9 @@ public class Settings {
public static final ConfigSetting STARTER_KIT = new ConfigSetting(config, "Main.Starter Kit", "none"); public static final ConfigSetting STARTER_KIT = new ConfigSetting(config, "Main.Starter Kit", "none");
public static final ConfigSetting KEY_MATERIAL = new ConfigSetting(config, "Main.Key Material", "TRIPWIRE_HOOK", public static final ConfigSetting KEY_MATERIAL = new ConfigSetting(config, "Main.Key Material", "TRIPWIRE_HOOK",
"What type of material should be used for kit keys?"); "What type of material should be used for kit keys?");
public static final ConfigSetting ROULETTE_LENGTH_MULTIPLIER = new ConfigSetting(config, "Main.Roulette Length Multiplier", 10,
"This affects the roulette animation length.",
"Lower value is a lower length, and vice-versa.");
public static final ConfigSetting ECONOMY_PLUGIN = new ConfigSetting(config, "Main.Economy", EconomyManager.getEconomy() == null ? "Vault" : EconomyManager.getEconomy().getName(), public static final ConfigSetting ECONOMY_PLUGIN = new ConfigSetting(config, "Main.Economy", EconomyManager.getEconomy() == null ? "Vault" : EconomyManager.getEconomy().getName(),
"Which economy plugin should be used?", "Which economy plugin should be used?",