Skip to content
This repository has been archived by the owner on Apr 24, 2023. It is now read-only.

Commit

Permalink
KingKits v5.2.4
Browse files Browse the repository at this point in the history 
KingKits v5.2.4 update.
  • Loading branch information
KingFaris10 committed Mar 21, 2016
1 parent a7da9f0 commit a730d38
Show file tree
Hide file tree
Showing 6 changed files with 109 additions and 37 deletions.
5 changes: 0 additions & 5 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,6 @@ local.properties
.iml
.target/

#################
## Maven
#################
.src/test/

#################
## Visual Studio
#################
Expand Down
12 changes: 6 additions & 6 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.faris</groupId>
<artifactId>KingKits</artifactId>
<version>5.2.3</version>
<version>5.2.4</version>

<packaging>jar</packaging>

Expand Down Expand Up @@ -41,7 +41,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
<version>2.10.1</version>
<version>2.10.3</version>
<configuration>
<linksource>true</linksource>
<reportOutputDirectory>${project.basedir}</reportOutputDirectory>
Expand All @@ -52,7 +52,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.2</version>
<version>3.5.1</version>
<configuration>
<source>1.7</source>
<target>1.7</target>
Expand All @@ -61,7 +61,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>2.3</version>
<version>2.4.3</version>
<configuration>
<createDependencyReducedPom>false</createDependencyReducedPom>
<artifactSet>
Expand Down Expand Up @@ -99,7 +99,7 @@
<plugin>
<groupId>com.github.github</groupId>
<artifactId>site-maven-plugin</artifactId>
<version>0.11</version>
<version>0.12</version>
<configuration>
<message>Maven artifacts for ${project.version}</message>
<noJekyll>true</noJekyll>
Expand Down Expand Up @@ -148,7 +148,7 @@
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.3.1</version>
<version>2.6.2</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
17 changes: 13 additions & 4 deletions src/main/java/com/faris/kingkits/helper/util/ItemUtilities.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,19 @@ public static ItemStack deserializeItem(Map<String, Object> serializedItem, Item
List<ItemFlag> itemFlags = new LinkedList<>();
for (String strItemFlag : strItemFlags) {
try {
for (ItemFlag itemFlag : ItemFlag.values()) {
if (itemFlag.name().replace('_', ' ').equalsIgnoreCase(strItemFlag.replace('_', ' '))) {
itemFlags.add(itemFlag);
break;
if (strItemFlag.equals("*")) {
itemFlags.clear();
for (ItemFlag itemFlag : ItemFlag.values()) {
if (itemFlag != null) itemFlags.add(itemFlag);
}
break;
} else {
strItemFlag = strItemFlag.toUpperCase().replace(' ', '_');
for (ItemFlag itemFlag : ItemFlag.values()) {
if (itemFlag != null && itemFlag.name().equals(strItemFlag)) {
itemFlags.add(itemFlag);
break;
}
}
}
} catch (Exception ex) {
Expand Down
6 changes: 2 additions & 4 deletions src/main/java/com/faris/kingkits/listener/CommandListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,7 @@
import com.faris.kingkits.Kit;
import com.faris.kingkits.Messages;
import com.faris.kingkits.Permissions;
import com.faris.kingkits.controller.ConfigController;
import com.faris.kingkits.controller.KitController;
import com.faris.kingkits.controller.PlayerController;
import com.faris.kingkits.controller.SQLController;
import com.faris.kingkits.controller.*;
import com.faris.kingkits.helper.util.*;
import com.faris.kingkits.player.KitPlayer;
import com.faris.kingkits.player.OfflineKitPlayer;
Expand Down Expand Up @@ -67,6 +64,7 @@ public boolean onCommand(final CommandSender sender, Command cmd, String label,
ConfigController.getInstance().loadConfiguration();

KitController.getInstance().loadKits();
GuiController.getInstance().loadInventories();

SQLController.getInstance().setHandler(MySQLHandler.newInstance(this.plugin, ConfigController.getInstance().getSQLDetails()));
SQLController.getInstance().openConnection();
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/faris/kingkits/listener/EventListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,12 +126,12 @@ public void onPlayerInteract(PlayerInteractEvent event) {
try {
if (event.getAction() == Action.RIGHT_CLICK_AIR || event.getAction() == Action.RIGHT_CLICK_BLOCK) {
if (event.getItem() != null) {
if (event.getMaterial() == ConfigController.getInstance().getGuiItemType() && (ConfigController.getInstance().getGuiItemData() == -1 || event.getItem().getDurability() == ConfigController.getInstance().getGuiItemData())) {
if (event.getItem().getType() == ConfigController.getInstance().getGuiItemType() && (ConfigController.getInstance().getGuiItemData() == -1 || event.getItem().getDurability() == ConfigController.getInstance().getGuiItemData())) {
if (Utilities.isPvPWorld(player.getWorld())) {
GuiController.getInstance().openKitsMenu(player);
event.setCancelled(true);
}
} else if (event.getMaterial() == Material.MUSHROOM_SOUP) {
} else if (event.getItem().getType() == Material.MUSHROOM_SOUP) {
if (ConfigController.getInstance().canQuickSoup()) {
if (player.hasPermission(Permissions.SOUP_QUICKSOUP)) {
if (Utilities.isPvPWorld(player.getWorld())) {
Expand All @@ -146,6 +146,7 @@ public void onPlayerInteract(PlayerInteractEvent event) {
valid = false;
}
if (valid) {
event.setCancelled(true);
if (soupAmount == 1) {
if (event.getHand() == EquipmentSlot.HAND)
player.getInventory().setItemInMainHand(new ItemStack(Material.BOWL));
Expand All @@ -160,7 +161,6 @@ else if (event.getHand() == EquipmentSlot.OFF_HAND)
player.getInventory().setItemInOffHand(newItem);
player.getInventory().addItem(new ItemStack(Material.BOWL));
}
event.setCancelled(true);
}
}
}
Expand Down
100 changes: 85 additions & 15 deletions src/main/java/com/faris/kingkits/listener/commands/CommandRefill.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,11 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
if (player.hasPermission(Permissions.COMMAND_SOUP_REFILL_SINGLE)) {
if (player.getInventory().getItemInMainHand() != null && player.getInventory().getItemInMainHand().getType() == Material.BOWL) {
int invContentsSize = 0;
ItemStack[] itemContents = player.getInventory().getStorageContents();
for (ItemStack itemContent : itemContents) {
if (itemContent != null) {
if (itemContent.getType() != Material.AIR) invContentsSize++;
}
ItemStack[] invContents = player.getInventory().getStorageContents();
for (ItemStack invContent : invContents) {
if (!ItemUtilities.isNull(invContent)) invContentsSize++;
}
if (invContentsSize < itemContents.length) {
if (invContentsSize < invContents.length) {
ItemStack itemInHand = player.getInventory().getItemInMainHand();
if (ConfigController.getInstance().getCostPerRefill() > 0D) {
double cost = ConfigController.getInstance().getCostPerRefill();
Expand All @@ -64,6 +62,34 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_FULL_INV);
}
} else if (player.getInventory().getItemInOffHand() != null && player.getInventory().getItemInOffHand().getType() == Material.BOWL) {
int invContentsSize = 0;
ItemStack[] invContents = player.getInventory().getStorageContents();
for (ItemStack invContent : invContents) {
if (!ItemUtilities.isNull(invContent)) invContentsSize++;
}
if (invContentsSize < invContents.length) {
ItemStack itemInHand = player.getInventory().getItemInOffHand();
if (ConfigController.getInstance().getCostPerRefill() > 0D) {
double cost = ConfigController.getInstance().getCostPerRefill();
if (PlayerUtilities.getBalance(player) >= cost) {
PlayerUtilities.incrementMoney(player, -cost);
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_NOT_ENOUGH_MONEY);
return true;
}
}
int amount = itemInHand.getAmount();
if (amount <= 1) {
player.getInventory().setItemInOffHand(new ItemStack(Material.MUSHROOM_SOUP));
} else {
itemInHand.setAmount(amount - 1);
player.getInventory().setItemInOffHand(itemInHand);
player.getInventory().addItem(new ItemStack(Material.MUSHROOM_SOUP));
}
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_FULL_INV);
}
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_BOWL);
}
Expand All @@ -76,18 +102,15 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
if (player.getInventory().getItemInMainHand() != null && player.getInventory().getItemInMainHand().getType() == Material.BOWL) {
int invContentsSize = 0;
ItemStack[] inventoryContents = player.getInventory().getStorageContents();
for (ItemStack itemContent : inventoryContents) {
if (!ItemUtilities.isNull(itemContent)) invContentsSize++;
for (ItemStack invContent : inventoryContents) {
if (!ItemUtilities.isNull(invContent)) invContentsSize++;
}
if (invContentsSize < player.getInventory().getSize()) {
if (invContentsSize < inventoryContents.length) {
int bowlAmount = player.getInventory().getItemInMainHand().getAmount();
int invSize = 0, bowlsToGive = 0;
ItemStack[] itemContents = player.getInventory().getStorageContents();
int invMaxSize = player.getInventory().getSize();
for (ItemStack itemContent : itemContents) {
if (itemContent != null) {
if (itemContent.getType() != Material.AIR) invSize++;
}
int invMaxSize = inventoryContents.length;
for (ItemStack invContent : inventoryContents) {
if (!ItemUtilities.isNull(invContent)) invSize++;
}
for (int i = 0; i < bowlAmount; i++) {
if (invSize + bowlsToGive < invMaxSize) {
Expand Down Expand Up @@ -123,6 +146,53 @@ public boolean onCommand(CommandSender sender, Command cmd, String label, String
player.getInventory().setItemInMainHand(new ItemStack(Material.MUSHROOM_SOUP));
}
}
} else if (player.getInventory().getItemInOffHand() != null && player.getInventory().getItemInOffHand().getType() == Material.BOWL) {
int invContentsSize = 0;
ItemStack[] inventoryContents = player.getInventory().getStorageContents();
for (ItemStack itemContent : inventoryContents) {
if (!ItemUtilities.isNull(itemContent)) invContentsSize++;
}
if (invContentsSize < inventoryContents.length) {
int bowlAmount = player.getInventory().getItemInOffHand().getAmount();
int invSize = 0, bowlsToGive = 0;
int invMaxSize = inventoryContents.length;
for (ItemStack invContent : inventoryContents) {
if (!ItemUtilities.isNull(invContent)) invSize++;
}
for (int i = 0; i < bowlAmount; i++) {
if (invSize + bowlsToGive < invMaxSize) {
bowlsToGive++;
}
}
if (ConfigController.getInstance().getCostPerRefill() > 0D) {
double cost = ConfigController.getInstance().getCostPerRefill() * bowlsToGive;
if (PlayerUtilities.getBalance(player) >= cost) {
PlayerUtilities.incrementMoney(player, -cost);
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_NOT_ENOUGH_MONEY);
return true;
}
}
for (int i = 0; i < bowlsToGive; i++)
player.getInventory().addItem(new ItemStack(Material.MUSHROOM_SOUP, 1));
if (player.getInventory().getItemInOffHand().getAmount() - bowlsToGive > 0)
player.getInventory().setItemInOffHand(new ItemStack(Material.BOWL, player.getInventory().getItemInOffHand().getAmount() - bowlsToGive));
else
player.getInventory().setItemInOffHand(new ItemStack(Material.AIR));
} else {
if (player.getInventory().getItemInOffHand().getAmount() == 1) {
if (ConfigController.getInstance().getCostPerRefill() > 0D) {
double cost = ConfigController.getInstance().getCostPerRefill();
if (PlayerUtilities.getBalance(player) >= cost) {
PlayerUtilities.incrementMoney(player, -cost);
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_NOT_ENOUGH_MONEY);
return true;
}
}
player.getInventory().setItemInOffHand(new ItemStack(Material.MUSHROOM_SOUP));
}
}
} else {
Messages.sendMessage(player, Messages.COMMAND_REFILL_BOWL);
}
Expand Down

0 comments on commit a730d38

Please sign in to comment.