mirror of
https://github.com/AtlasMediaGroup/TotalFreedomMod.git
synced 2024-11-27 09:15:38 +00:00
c4fce3f0f9
* Command_adminworld.java * Command_adventure.java * Command_banip.java * Command_blockedit.java * Command_blockpvp.java * Command_cage.java * Command_cartsit.java * Command_clearchat.java * Command_clearinventory.java * Command_commandlist.java * Command_creative.java * Command_deop.java * Command_deopall.java * Command_dispfill.java * Command_doom.java * Command_gcmd.java * Command_hubworld.java * Command_inspect.java * Command_list.java * Command_lockup.java * Command_manageshop.java * Command_manuallyverify.java * Command_masterbuilderworld.java * Command_mbconfig.java * Command_moblimiter.java * Command_mp44.java * Command_mute.java * Command_nickfilter.java * Command_op.java * Command_opall.java * Command_opme.java * Command_potion.java (Also corrected the inconsistent "player not found" message's color) * Command_rank.java * Command_ride.java * Command_saconfig.java * Command_scare.java * Command_setplayerlimit.java * Command_settotalvotes.java * Command_smite.java * Command_spectator.java * Command_survival.java * Command_unblockcmd.java * Command_uncage.java * Command_unmute.java * Command_verifynoadmin.java Here are some commands I added functionality to: * Command_dispfill.java: Added some code that hooks into the CoreProtect API to log the items being removed from and added into the dispensers. * Command_setlever.java: Added some code that hooks into the CoreProtect API to log the levers being interacted with. Here's a command I fixed a critical bug in: * Command_setlever.java
103 lines
3.6 KiB
Java
103 lines
3.6 KiB
Java
package me.totalfreedom.totalfreedommod.command;
|
|
|
|
import java.util.ArrayList;
|
|
import java.util.List;
|
|
import me.totalfreedom.totalfreedommod.rank.Rank;
|
|
import me.totalfreedom.totalfreedommod.util.FUtil;
|
|
import org.apache.commons.lang.StringUtils;
|
|
import org.bukkit.Location;
|
|
import org.bukkit.Material;
|
|
import org.bukkit.block.Block;
|
|
import org.bukkit.block.Dispenser;
|
|
import org.bukkit.command.Command;
|
|
import org.bukkit.command.CommandSender;
|
|
import org.bukkit.entity.Player;
|
|
import org.bukkit.inventory.Inventory;
|
|
import org.bukkit.inventory.ItemStack;
|
|
|
|
@CommandPermissions(level = Rank.OP, source = SourceType.ONLY_IN_GAME)
|
|
@CommandParameters(description = "Fill nearby dispensers with a set of items of your choice.", usage = "/<command> <radius> <comma,separated,items>")
|
|
public class Command_dispfill extends FreedomCommand
|
|
{
|
|
|
|
private static void setDispenserContents(final Block targetBlock, final ItemStack[] items)
|
|
{
|
|
if (targetBlock.getType() == Material.DISPENSER)
|
|
{
|
|
final Inventory dispenserInv = ((Dispenser)targetBlock.getState()).getInventory();
|
|
dispenserInv.clear();
|
|
dispenserInv.addItem(items);
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public boolean run(CommandSender sender, Player playerSender, Command cmd, String commandLabel, String[] args, boolean senderIsConsole)
|
|
{
|
|
if (args.length == 2)
|
|
{
|
|
int radius;
|
|
|
|
try
|
|
{
|
|
radius = Math.max(5, Math.min(25, Integer.parseInt(args[0])));
|
|
}
|
|
catch (NumberFormatException ex)
|
|
{
|
|
msg("Invalid radius.");
|
|
return true;
|
|
}
|
|
|
|
final List<ItemStack> items = new ArrayList<>();
|
|
|
|
final String[] itemsRaw = StringUtils.split(args[1], ",");
|
|
for (final String searchItem : itemsRaw)
|
|
{
|
|
Material material = Material.matchMaterial(searchItem);
|
|
|
|
if (material != null)
|
|
{
|
|
items.add(new ItemStack(material, 64));
|
|
}
|
|
else
|
|
{
|
|
msg("Skipping invalid item: " + searchItem);
|
|
}
|
|
}
|
|
|
|
final ItemStack[] itemsArray = items.toArray(new ItemStack[0]);
|
|
|
|
int affected = 0;
|
|
final Location centerLocation = playerSender.getLocation();
|
|
final Block centerBlock = centerLocation.getBlock();
|
|
for (int xOffset = -radius; xOffset <= radius; xOffset++)
|
|
{
|
|
for (int yOffset = -radius; yOffset <= radius; yOffset++)
|
|
{
|
|
for (int zOffset = -radius; zOffset <= radius; zOffset++)
|
|
{
|
|
final Block targetBlock = centerBlock.getRelative(xOffset, yOffset, zOffset);
|
|
if (targetBlock.getLocation().distanceSquared(centerLocation) < (radius * radius))
|
|
{
|
|
if (targetBlock.getType().equals(Material.DISPENSER))
|
|
{
|
|
msg("Filling dispenser @ " + FUtil.formatLocation(targetBlock.getLocation()));
|
|
plugin.cpb.getCoreProtectAPI().logContainerTransaction(sender.getName(), targetBlock.getLocation());
|
|
setDispenserContents(targetBlock, itemsArray);
|
|
affected++;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
msg("Done. " + affected + " dispenser(s) filled.");
|
|
}
|
|
else
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
}
|