EpicKnarvik97/ItemCase
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Implement modify command.

Browse Source
This commit is contained in:
Jesse Prescott
2018-06-04 02:17:56 +01:00
parent 4a61a1f30e
commit 788eac8469
8 changed files with 617 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/gmail/bleedobsidian/itemcase/CommandHandler.java
View File

@@ -14,6 +14,7 @@
*/
package com.gmail.bleedobsidian.itemcase;
import com.gmail.bleedobsidian.itemcase.commands.CreateCommand;
import com.gmail.bleedobsidian.itemcase.commands.ModifyCommand;
import com.gmail.bleedobsidian.itemcase.commands.DestroyCommand;
import org.bukkit.command.Command;
@@ -46,11 +47,14 @@ public final class CommandHandler implements CommandExecutor {
switch(args[0]) {
case "create":
new ModifyCommand().execute(sender, label, args);
new CreateCommand().execute(sender, label, args);
break;
case "destroy":
new DestroyCommand().execute(sender, label, args);
break;
case "modify":
new ModifyCommand().execute(sender, label, args);
break;
default:
this.showHelp(sender, label);
break;

2
src/main/java/com/gmail/bleedobsidian/itemcase/Itemcase.java
View File

@@ -47,6 +47,8 @@ import org.bukkit.util.Vector;
*/
public final class Itemcase {
//TODO: Despawn items that were left from a config delete.
/**
* Types of Itemcase.
*/

8
src/main/java/com/gmail/bleedobsidian/itemcase/commands/DestroyCommand.java
View File

@@ -51,8 +51,8 @@ public final class DestroyCommand implements Command {
// Cast sender to player.
Player player = (Player) sender;
// Check if player has permission.
if(!player.hasPermission("itemcase.destroy")) {
// Check if player has permission (Uses create permission).
if(!player.hasPermission("itemcase.create")) {
// Send message.
chatLogger.message(player, "command.permission");
@@ -74,7 +74,7 @@ public final class DestroyCommand implements Command {
if(!manager.isItemcase(target)) {
// Show message.
chatLogger.message(player, "command.destroy.invalid-location");
chatLogger.message(player, "command.invalid-location");
// Exit.
return;
@@ -93,7 +93,7 @@ public final class DestroyCommand implements Command {
if(!player.hasPermission("itemcase.destroy.other")) {
// Show message.
chatLogger.message(player, "command.destroy.not-owner");
chatLogger.message(player, "command.not-owner");
// Exit.
return;

541
src/main/java/com/gmail/bleedobsidian/itemcase/commands/ModifyCommand.java Normal file
View File

@@ -0,0 +1,541 @@
/*
* ItemCase is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/gpl.html>.
*/
package com.gmail.bleedobsidian.itemcase.commands;
import com.gmail.bleedobsidian.itemcase.ChatLogger;
import com.gmail.bleedobsidian.itemcase.GenericLogger;
import com.gmail.bleedobsidian.itemcase.ItemCaseCore;
import com.gmail.bleedobsidian.itemcase.Itemcase;
import com.gmail.bleedobsidian.itemcase.Itemcase.StorageType;
import com.gmail.bleedobsidian.itemcase.Itemcase.Type;
import com.gmail.bleedobsidian.itemcase.LanguageTranslator;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.command.CommandSender;
import org.bukkit.entity.Player;
/**
* A command handler for the 'modify' command.
*
* @author Jesse Prescott (BleedObsidian)
*/
public final class ModifyCommand implements Command {
@Override
public void execute(CommandSender sender, String label,
String[] args) {
// If sender is not a player.
if(!(sender instanceof Player)) {
// Send message.
ItemCaseCore.instance.getGenericLogger().message(
sender, "command.not-player");
// Exit.
return;
}
// Check command params have been given.
if(args.length != 3) {
// Shop help message.
this.showHelp(sender, label);
// Exit.
return;
}
// Get chat logger.
ChatLogger chatLogger = ItemCaseCore.instance.getChatLogger();
// Cast sender to player.
Player player = (Player) sender;
// Check if player has permission (Uses create permission).
if(!player.hasPermission("itemcase.create")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// The target location.
Location target = null;
// Get the players target block.
target = player.getTargetBlock(null, 3).getLocation();
// Check if itemcase already exists here.
if(!ItemCaseCore.instance.getItemcaseManager().isItemcase(target)) {
// Show message.
chatLogger.message(player, "command.invalid-location");
// Exit.
return;
}
// Get itemcase.
Itemcase itemcase =
ItemCaseCore.instance.getItemcaseManager().getItemcase(target);
// Get owner.
OfflinePlayer owner = itemcase.getOwner();
// Check if this player owns this itemcase.
if(!owner.equals(player)) {
// Check if player is allowed to modify other peoples itemcases.
if(!player.hasPermission("itemcase.modify.other")) {
// Show message.
chatLogger.message(player, "command.not-owner");
// Exit.
return;
}
}
// Get flag.
String flag = args[1];
// Get value.
String value = args[2];
// Switch flag.
switch(flag.toLowerCase()) {
case "type":
this.typeFlag(label, player, itemcase, value);
break;
case "storage_type":
this.storageTypeFlag(label, player, itemcase, value);
break;
case "buy_price":
this.buyPriceFlag(label, player, itemcase, value);
break;
case "sell_price":
this.sellPriceFlag(label, player, itemcase, value);
break;
default:
this.showHelp(sender, label);
break;
}
// Exit.
return;
}
/**
* Type flag.
*
* @param label label.
* @param player Player.
* @param itemcase Itemcase.
* @param value Flag value.
*/
private void typeFlag(String label, Player player, Itemcase itemcase,
String value) {
// Get chat logger.
ChatLogger chatLogger = ItemCaseCore.instance.getChatLogger();
// If the itemcase was a shop.
boolean wasShop = false;
// If the itemcase was a shop.
if(itemcase.getType() != Type.SHOWCASE) {
// Set boolean.
wasShop = true;
}
// If the itemcase is now a shop.
boolean isNowShop = false;
// Switch value.
switch(value.toLowerCase()) {
// Showcase.
case "showcase":
// Set type.
itemcase.setType(Type.SHOWCASE);
// Break.
break;
// Shop buy.
case "shop_buy":
// Check if player has permission.
if(!player.hasPermission("itemcase.create.shop.buy")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// Set boolean
isNowShop = true;
// Set type.
itemcase.setType(Type.SHOP_BUY);
// Break.
break;
// Shop sell.
case "shop_sell":
// Check if player has permission.
if(!player.hasPermission("itemcase.create.shop.sell")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// Set boolean
isNowShop = true;
// Set type.
itemcase.setType(Type.SHOP_SELL);
// Break.
break;
// Shop multi.
case "shop_multi":
// Check if player has permission.
if(!player.hasPermission("itemcase.create.shop.buy") ||
!player.hasPermission("itemcase.create.shop.sell")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// Set boolean
isNowShop = true;
// Set type.
itemcase.setType(Type.SHOP_MULTI);
// Break.
break;
// Default.
default:
// Show help.
this.showHelp(player, label);
// Exit.
return;
}
// If itemcase is now a shop but wasn't before.
if(isNowShop && !wasShop) {
// Set storage.
itemcase.setStorage(Bukkit.createInventory(
null, 54, "ItemCase Storage"));
}
// Save itemcase.
ItemCaseCore.instance.getItemcaseManager().saveItemcases(itemcase);
// Show message.
chatLogger.message(player, "command.modify.success");
}
/**
* Storage Type flag.
*
* @param label label.
* @param player Player.
* @param itemcase Itemcase.
* @param value Flag value.
*/
private void storageTypeFlag(String label, Player player, Itemcase itemcase,
String value) {
// Get chat logger.
ChatLogger chatLogger = ItemCaseCore.instance.getChatLogger();
// If itemcase is not a shop.
if(itemcase.getType() == Type.SHOWCASE) {
// Show message.
chatLogger.message(player, "command.modify.not-shop");
// Exit.
return;
}
// Switch value.
switch(value.toLowerCase()) {
// Finite.
case "finite":
// Set storage type.
itemcase.setStorageType(StorageType.FINITE);
// Break.
break;
// Infinite.
case "infinite":
// Check if player has permission.
if(!player.hasPermission("itemcase.create.shop.infinite")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// Set storage type.
itemcase.setStorageType(StorageType.INFINITE);
// Break.
break;
// Default.
default:
// Show help.
this.showHelp(player, label);
// Exit.
return;
}
// Save itemcase.
ItemCaseCore.instance.getItemcaseManager().saveItemcases(itemcase);
// Show message.
chatLogger.message(player, "command.modify.success");
}
/**
* Buy Price flag.
*
* @param label label.
* @param player Player.
* @param itemcase Itemcase.
* @param value Flag value.
*/
private void buyPriceFlag(String label, Player player, Itemcase itemcase,
String value) {
// Get chat logger.
ChatLogger chatLogger = ItemCaseCore.instance.getChatLogger();
// Check if player has permission.
if(!player.hasPermission("itemcase.create.shop.buy")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// If itemcase is not a shop.
if(itemcase.getType() == Type.SHOWCASE) {
// Show message.
chatLogger.message(player, "command.modify.not-shop");
// Exit.
return;
}
// If itemcase only sells items.
if(itemcase.getType() == Type.SHOP_SELL) {
// Show message.
chatLogger.message(player, "command.modify.sell-only");
// Exit.
return;
}
// Attempt to cast value to double.
try {
// Cast to double.
double buyPrice = Double.parseDouble(value);
// Set price.
itemcase.setBuyPrice(buyPrice);
// Failed to parse value.
} catch (NumberFormatException e) {
// Show message.
chatLogger.message(player, "command.modify.invalid-price");
// Exit.
return;
}
// Save itemcase.
ItemCaseCore.instance.getItemcaseManager().saveItemcases(itemcase);
// Show message.
chatLogger.message(player, "command.modify.success");
}
/**
* Sell Price flag.
*
* @param label label.
* @param player Player.
* @param itemcase Itemcase.
* @param value Flag value.
*/
private void sellPriceFlag(String label, Player player, Itemcase itemcase,
String value) {
// Get chat logger.
ChatLogger chatLogger = ItemCaseCore.instance.getChatLogger();
// Check if player has permission.
if(!player.hasPermission("itemcase.create.shop.sell")) {
// Send message.
chatLogger.message(player, "command.permission");
// Exit.
return;
}
// If itemcase is not a shop.
if(itemcase.getType() == Type.SHOWCASE) {
// Show message.
chatLogger.message(player, "command.modify.not-shop");
// Exit.
return;
}
// If itemcase only buys items.
if(itemcase.getType() == Type.SHOP_BUY) {
// Show message.
chatLogger.message(player, "command.modify.buy-only");
// Exit.
return;
}
// Attempt to cast value to double.
try {
// Cast to double.
double sellPrice = Double.parseDouble(value);
// Set price.
itemcase.setSellPrice(sellPrice);
// Failed to parse value.
} catch (NumberFormatException e) {
// Show message.
chatLogger.message(player, "command.modify.invalid-price");
// Exit.
return;
}
// Save itemcase.
ItemCaseCore.instance.getItemcaseManager().saveItemcases(itemcase);
// Show message.
chatLogger.message(player, "command.modify.success");
}
/**
* Show help for main command to given sender.
*
* @param sender CommandSender.
*/
private void showHelp(CommandSender sender, String label) {
// Get translator.
LanguageTranslator translator = ItemCaseCore.instance.getTranslator();
// Set placeholder.
translator.setPlaceholder("%COMMAND%",
"/" + label + " modify [flag] [value]");
// Check if sender is a player or console.
if(sender instanceof Player) {
// Cast sender to player.
Player player = (Player) sender;
// Get chat logger.
ChatLogger logger = ItemCaseCore.instance.getChatLogger();
// Send message to player.
logger.message(player, "command.itemcase-help");
// Send flag help.
logger.message(player, "[flag] [value]:");
// Send flag help.
logger.message(player,
" type [showcase/shop_buy/shop_sell/shop_multi]");
// Send flag help.
logger.message(player,
" storage_type [finite/infinite]");
// Send flag help.
logger.message(player,
" buy_price [price]");
// Send flag help.
logger.message(player,
" sell_price [price]");
} else {
// Get console logger.
GenericLogger logger = ItemCaseCore.instance.getGenericLogger();
// Send console message.
logger.message(sender, "command.itemcase-help");
}
}
}

2
src/main/java/com/gmail/bleedobsidian/itemcase/configurations/WorldFile.java
View File

@@ -319,7 +319,7 @@ public class WorldFile extends ConfigurationFile {
private Inventory deserializeInventory(Map<String, Object> map) {
// Get size.
int size = Integer.parseInt((String) map.get("size"));
int size = (int) map.get("size");
// Get name.
String name = (String) map.get("name");

24
src/main/java/com/gmail/bleedobsidian/itemcase/managers/ItemcaseManager.java
View File

@@ -103,6 +103,30 @@ public final class ItemcaseManager {
"console.info.loaded");
}
/**
* Save given Itemcase.
*
* @param itemcase Itemcase.
*/
public void saveItemcases(Itemcase itemcase) {
// Get world file.
WorldFile file = this.worldFiles.get(itemcase.getLocation().getWorld());
// Attempt to save itemcase.
try {
// Save itemcase.
file.saveItemcase(itemcase);
} catch (IOException e) {
// Log error.
ItemCaseCore.instance.getConsoleLogger().severe(
"Failed to save itemcase to config.", e);
}
}
/**
* Create a new Itemcase.
*

36
src/main/resources/languages/EN.yml
View File

@@ -31,10 +31,17 @@ command:
# player.
not-player: "You must be a player to use this command."
# Shown when a player tries to destroy another persons itemcase when
# they do not have permission itemcase.destroy.other.
not-owner: "You do not own this ItemCase."
# Shown when a user tries to execute a command and they do not have the
# required permission.
permission: "You do not have permission to use this command."
# Shown when a player uses a command but is not looking at an itemcase.
invalid-location: "This block is not an ItemCase."
# Messages shown when using the 'create' command.
create:
@@ -56,13 +63,26 @@ command:
# Messages shown when using the 'destroy' command.
destroy:
# Shown when a player uses the destroy command but is not looking at
# an itemcase.
invalid-location: "This block is not an ItemCase."
# Shown when a player tries to destroy another persons itemcase when
# they do not have permission itemcase.destroy.other.
not-owner: "You do not own this ItemCase."
# Shown to the player upon successful deletion.
success: "ItemCase destroyed."
# Messages shwon when using the 'modify' command.
modify:
# Shown to the player when trying to set storage type on an itemcase
# that is not a shop.
not-shop: "This ItemCase is not a shop."
# Shown to the player when trying to set the sell price of an ItemCase
# that only buys items.
sell-only: "This ItemCase only sells items."
# Shown to the player when trying to set the buy price of an ItemCase
# that only sells items.
buy-only: "This ItemCase only buys items."
# Shown to the player when setting a buy/sell price that is invalid.
invalid-price: "Invalid price."
# Shown to the player upon successful modification.
success: "ItemCase flag modified."

10
src/main/resources/plugin.yml
View File

@@ -17,3 +17,13 @@ commands:
permissions:
itemcase.create:
description: Create and destroy showcase itemcases.
itemcase.create.shop.buy:
description: Create itemcases that can buy things from players.
itemcase.create.shop.sell:
description: Create itemcases that can sell things to players.
itemcase.create.shop.infinite:
description: Create an itemcase shop that has infinite items to buy/sell.
itemcase.modify.other:
description: Modify flags of itemcases you don't own.
itemcase.destroy.other:
description: Destroy an itemcase you don't own.