mirror of
https://github.com/zDevelopers/ImageOnMap.git
synced 2024-09-29 06:57:29 +02:00
Code cleanup
This commit is contained in:
parent
b01f133639
commit
f007e8e0b9
@ -69,7 +69,6 @@ public class UpdateCommand extends IoMCommand
|
|||||||
ImageUtils.ScalingType scaling = ImageUtils.ScalingType.NONE;
|
ImageUtils.ScalingType scaling = ImageUtils.ScalingType.NONE;
|
||||||
URL url;
|
URL url;
|
||||||
|
|
||||||
|
|
||||||
if(args.length < 1) throwInvalidArgument(I.t("You must give an URL and a map name to update."));
|
if(args.length < 1) throwInvalidArgument(I.t("You must give an URL and a map name to update."));
|
||||||
if(args.length < 2) throwInvalidArgument(I.t("You must give a map name to update."));
|
if(args.length < 2) throwInvalidArgument(I.t("You must give a map name to update."));
|
||||||
|
|
||||||
@ -82,22 +81,15 @@ public class UpdateCommand extends IoMCommand
|
|||||||
Integer[] size={1,1};
|
Integer[] size={1,1};
|
||||||
if(map.getType()== ImageMap.Type.POSTER)
|
if(map.getType()== ImageMap.Type.POSTER)
|
||||||
size=map.getSize( new HashMap<String, Object>(),map.getUserUUID(),map.getId());
|
size=map.getSize( new HashMap<String, Object>(),map.getUserUUID(),map.getId());
|
||||||
|
|
||||||
int width=size[0],height=size[1];
|
int width=size[0],height=size[1];
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
|
||||||
|
|
||||||
ActionBar.sendPermanentMessage(player, ChatColor.DARK_GREEN + I.t("Updating..."));
|
ActionBar.sendPermanentMessage(player, ChatColor.DARK_GREEN + I.t("Updating..."));
|
||||||
ImageRendererExecutor.update(url, scaling, player.getUniqueId(), map, width, height, new WorkerCallback<ImageMap>() {
|
ImageRendererExecutor.update(url, scaling, player.getUniqueId(), map, width, height, new WorkerCallback<ImageMap>() {
|
||||||
@Override
|
@Override
|
||||||
public void finished(ImageMap result) {
|
public void finished(ImageMap result) {
|
||||||
ActionBar.removeMessage(player);
|
ActionBar.removeMessage(player);
|
||||||
MessageSender.sendActionBarMessage(player, ChatColor.DARK_GREEN + I.t("Updating finished!"));
|
MessageSender.sendActionBarMessage(player, ChatColor.DARK_GREEN + I.t("Updating finished!"));
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void errored(Throwable exception) {
|
public void errored(Throwable exception) {
|
||||||
player.sendMessage(I.t("{ce}Map rendering failed: {0}", exception.getMessage()));
|
player.sendMessage(I.t("{ce}Map rendering failed: {0}", exception.getMessage()));
|
||||||
@ -109,123 +101,17 @@ public class UpdateCommand extends IoMCommand
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
//Added to fix bug with rendering displaying after error
|
|
||||||
finally {
|
finally {
|
||||||
ActionBar.removeMessage(player);
|
ActionBar.removeMessage(player);
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
catch(MalformedURLException ex)
|
catch(MalformedURLException ex)
|
||||||
{
|
{
|
||||||
throwInvalidArgument(I.t("Invalid URL."));
|
throwInvalidArgument(I.t("Invalid URL."));
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
/*catch (MapManagerException ex){
|
|
||||||
throwInvalidArgument(I.t("Update failed."));
|
|
||||||
return;
|
|
||||||
}*/
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
/* if(args.length >= 2)
|
|
||||||
{
|
|
||||||
if(args.length >= 4) {
|
|
||||||
width = Integer.parseInt(args[2]);
|
|
||||||
height = Integer.parseInt(args[3]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
switch(args[1]) {
|
|
||||||
case "resize": scaling = ImageUtils.ScalingType.CONTAINED; break;
|
|
||||||
case "resize-stretched": scaling = ImageUtils.ScalingType.STRETCHED; break;
|
|
||||||
case "resize-covered": scaling = ImageUtils.ScalingType.COVERED; break;
|
|
||||||
default: throwInvalidArgument(I.t("Invalid Stretching mode.")); break;
|
|
||||||
}
|
|
||||||
}*/
|
|
||||||
/* try {
|
|
||||||
|
|
||||||
|
|
||||||
ActionBar.sendPermanentMessage(player, ChatColor.DARK_GREEN + I.t("Updating map..."));
|
|
||||||
//ImageRendererExecutor.render(url, scaling, player.getUniqueId(), width, height, new WorkerCallback<ImageMap>() {
|
|
||||||
@Override
|
|
||||||
public void finished(ImageMap result) {
|
|
||||||
ActionBar.removeMessage(player);
|
|
||||||
MessageSender.sendActionBarMessage(player, ChatColor.DARK_GREEN + I.t("Rendering finished!"));
|
|
||||||
|
|
||||||
if (result.give(player) && (result instanceof PosterMap && !((PosterMap) result).hasColumnData())) {
|
|
||||||
info(I.t("The rendered map was too big to fit in your inventory."));
|
|
||||||
info(I.t("Use '/maptool getremaining' to get the remaining maps."));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public void errored(Throwable exception) {
|
|
||||||
player.sendMessage(I.t("{ce}Map rendering failed: {0}", exception.getMessage()));
|
|
||||||
|
|
||||||
PluginLogger.warning("Rendering from {0} failed: {1}: {2}",
|
|
||||||
player.getName(),
|
|
||||||
exception.getClass().getCanonicalName(),
|
|
||||||
exception.getMessage());
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
//Added to fix bug with rendering displaying after error
|
|
||||||
finally {
|
|
||||||
ActionBar.removeMessage(player);
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected void run() throws CommandException
|
|
||||||
{
|
|
||||||
ImageMap map = getMapFromArgs();
|
|
||||||
|
|
||||||
if (!hasFlag("confirm"))
|
|
||||||
{
|
|
||||||
RawText msg = new RawText(I.t("You are going to update") + " ")
|
|
||||||
.then(map.getId())
|
|
||||||
.color(ChatColor.GOLD)
|
|
||||||
.then(". " + I.t("Are you sure ? "))
|
|
||||||
.color(ChatColor.WHITE)
|
|
||||||
.then(I.t("[Confirm]"))
|
|
||||||
.color(ChatColor.GREEN)
|
|
||||||
.hover(new RawText(I.t("{red}This map will be updated {bold}forever{red}!")))
|
|
||||||
.command(getClass(), map.getId(), "--confirm")
|
|
||||||
.build();
|
|
||||||
|
|
||||||
send(msg);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
Player player = playerSender();
|
|
||||||
MapManager.clear(player.getInventory(), map);
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
MapManager.updateMap(map);
|
|
||||||
info(I.t("Map successfully updated."));
|
|
||||||
}
|
|
||||||
catch (MapManagerException ex)
|
|
||||||
{
|
|
||||||
PluginLogger.warning("A non-existent map was requested to be updated", ex);
|
|
||||||
warning(I.t("This map does not exist."));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
protected List<String> complete() throws CommandException
|
|
||||||
{
|
|
||||||
if(args.length == 1)
|
|
||||||
return getMatchingMapNames(playerSender(), args[0]);
|
|
||||||
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
@Override
|
@Override
|
||||||
public boolean canExecute(CommandSender sender)
|
public boolean canExecute(CommandSender sender)
|
||||||
{
|
{
|
||||||
|
@ -142,16 +142,9 @@ public class ImageRendererExecutor extends Worker
|
|||||||
// Limits are in place and the player does NOT have rights to avoid them.
|
// Limits are in place and the player does NOT have rights to avoid them.
|
||||||
checkSizeLimit(playerUUID, image );
|
checkSizeLimit(playerUUID, image );
|
||||||
|
|
||||||
|
|
||||||
updateMap(ImageUtils.ScalingType.CONTAINED.resize(image, width*128, height*128),playerUUID,map.getMapsIDs());
|
updateMap(ImageUtils.ScalingType.CONTAINED.resize(image, width*128, height*128),playerUUID,map.getMapsIDs());
|
||||||
return map;
|
return map;
|
||||||
/*if (scaling != ImageUtils.ScalingType.NONE && height <= 1 && width <= 1)
|
|
||||||
{
|
|
||||||
return updateSingle(scaling.resize(image, ImageMap.WIDTH, ImageMap.HEIGHT), playerUUID);
|
|
||||||
}
|
|
||||||
|
|
||||||
final BufferedImage resizedImage = scaling.resize(image, ImageMap.WIDTH * width, ImageMap.HEIGHT * height);
|
|
||||||
return updatePoster(resizedImage, playerUUID);*/
|
|
||||||
}
|
}
|
||||||
}, callback);
|
}, callback);
|
||||||
|
|
||||||
@ -162,8 +155,6 @@ public class ImageRendererExecutor extends Worker
|
|||||||
final PosterImage poster = new PosterImage(image);
|
final PosterImage poster = new PosterImage(image);
|
||||||
poster.splitImages();
|
poster.splitImages();
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
ImageIOExecutor.saveImage(mapsIDs, poster);
|
ImageIOExecutor.saveImage(mapsIDs, poster);
|
||||||
|
|
||||||
if (PluginConfiguration.SAVE_FULL_IMAGE.get())
|
if (PluginConfiguration.SAVE_FULL_IMAGE.get())
|
||||||
@ -179,10 +170,7 @@ public class ImageRendererExecutor extends Worker
|
|||||||
Renderer.installRenderer(poster, mapsIDs);
|
Renderer.installRenderer(poster, mapsIDs);
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
static private ImageMap renderSingle(final BufferedImage image, final UUID playerUUID) throws Throwable
|
static private ImageMap renderSingle(final BufferedImage image, final UUID playerUUID) throws Throwable
|
||||||
{
|
{
|
||||||
|
@ -167,18 +167,9 @@ public abstract class ImageMap implements ConfigurationSerializable
|
|||||||
{
|
{
|
||||||
PluginLogger.info(" "+tMap.toString());
|
PluginLogger.info(" "+tMap.toString());
|
||||||
if(tMap.get("id").equals(id)) {
|
if(tMap.get("id").equals(id)) {
|
||||||
|
|
||||||
return new Integer[]{(Integer)tMap.get("columns"), (Integer)tMap.get("rows")};
|
return new Integer[]{(Integer)tMap.get("columns"), (Integer)tMap.get("rows")};
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
static protected <T> T getFieldValue(Map<String, Object> map, String fieldName) throws InvalidConfigurationException
|
static protected <T> T getFieldValue(Map<String, Object> map, String fieldName) throws InvalidConfigurationException
|
||||||
|
Loading…
Reference in New Issue
Block a user