Upstream/ImageOnMap
1
0
Fork 0
mirror of https://github.com/zDevelopers/ImageOnMap.git synced 2024-09-30 15:37:40 +02:00
Code Issues Projects Releases Wiki Activity

Added an emptiness representation in the explorer GUI.

Browse Source 
It's an item displayed on the center of the GUI if there isn't any data to display.

 * NEW: added an item displayed if the explorer GUI is empty.
 * NEW: implementation of this empty item in the list GUI.
 * NEW: small adjustments on the statistics (removed the last empty line from the lore)
 * BUG: the old method was still used to remove the item attributes (the one from the `gui` package).
This commit is contained in:
Amaury Carrade 2015-09-10 16:00:14 +02:00
parent e7acbb36c4
commit 34b3a66220
2 changed files with 86 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
src/main/java/fr/moribus/imageonmap/guiproko/core/ExplorerGui.java
View File

@ -140,31 +140,42 @@ abstract public class ExplorerGui<T> extends ActionGui
updateAction("up", getPageItem("up", canGoUp())); updateAction("up", getPageItem("up", canGoUp()));
updateAction("down", getPageItem("down", canGoDown())); updateAction("down", getPageItem("down", canGoDown()));
} }
if(!isData2D)
{
int start = currentPageX * viewSize;
int max = Math.min(viewSize, data.length - start);
for(int i = 0; i < max; i++) if(data != null && data.length > 0)
{
if (!isData2D)
{ {
inventory.setItem(i, getViewItem(i + start)); int start = currentPageX * viewSize;
int max = Math.min(viewSize, data.length - start);
for (int i = 0; i < max; i++)
{
inventory.setItem(i, getViewItem(i + start));
}
}
else
{
int startX = currentPageX * viewWidth;
int startY = currentPageY * viewHeight;
int maxX = Math.min(viewWidth, dataWidth - startX);
int maxY = Math.min(viewHeight, dataHeight - startY);
for (int i = maxY; i-- > 0; )
{
for (int j = maxX; j-- > 0; )
{
inventory.setItem(i * INVENTORY_ROW_SIZE + j, getViewItem(j + startX, i + startY));
}
}
} }
} }
else else
{ {
int startX = currentPageX * viewWidth; ItemStack emptyIndicator = getEmptyViewItem();
int startY = currentPageY * viewHeight; if(emptyIndicator != null)
int maxX = Math.min(viewWidth, dataWidth - startX);
int maxY = Math.min(viewHeight, dataHeight - startY);
for(int i = maxY; i --> 0;)
{ {
for(int j = maxX; j --> 0;) action("", 22, emptyIndicator);
{
inventory.setItem(i * INVENTORY_ROW_SIZE + j, getViewItem(j + startX, i + startY));
}
} }
} }
@ -177,7 +188,7 @@ abstract public class ExplorerGui<T> extends ActionGui
int slot = event.getRawSlot(); int slot = event.getRawSlot();
// Clicked in the action bar // Clicked in the action bar
if(hasActions() && if(hasActions() &&
slot >= MAX_INVENTORY_SIZE - INVENTORY_ROW_SIZE slot >= MAX_INVENTORY_SIZE - INVENTORY_ROW_SIZE
&& slot < MAX_INVENTORY_SIZE) && slot < MAX_INVENTORY_SIZE)
{ {
@ -191,25 +202,42 @@ abstract public class ExplorerGui<T> extends ActionGui
super.onClick(event); super.onClick(event);
return; return;
} }
if(affectsGui(event)) // The user clicked in its own inventory // The user clicked in the GUI
if(affectsGui(event))
{ {
switch(event.getAction()) if(data != null && data.length > 0)
{ {
case PICKUP_ALL: case PICKUP_HALF: case PICKUP_ONE: case PICKUP_SOME: switch (event.getAction())
case HOTBAR_MOVE_AND_READD: case HOTBAR_SWAP: {
case MOVE_TO_OTHER_INVENTORY: case PICKUP_ALL:
onActionPickup(event); break; case PICKUP_HALF:
case PICKUP_ONE:
case PICKUP_SOME:
case HOTBAR_MOVE_AND_READD:
case HOTBAR_SWAP:
case MOVE_TO_OTHER_INVENTORY:
onActionPickup(event);
break;
case PLACE_ALL: case PLACE_ONE: case PLACE_SOME: case PLACE_ALL:
case SWAP_WITH_CURSOR: case PLACE_ONE:
onActionPut(event); break; case PLACE_SOME:
case SWAP_WITH_CURSOR:
onActionPut(event);
break;
case DROP_ALL_CURSOR: case DROP_ONE_CURSOR: case DROP_ALL_CURSOR:
break; case DROP_ONE_CURSOR:
break;
default: default:
event.setCancelled(true); event.setCancelled(true);
}
}
else
{
event.setCancelled(true);
} }
} }
else else
@ -435,6 +463,13 @@ abstract public class ExplorerGui<T> extends ActionGui
*/ */
protected ItemStack getViewItem(T data) { return null; } protected ItemStack getViewItem(T data) { return null; }
/**
* Returns the stack displayed in the center of the GUI if it is empty.
*
* @return The stack.
*/
protected ItemStack getEmptyViewItem() { return null; }
private ItemStack getPickedUpItem(int dataIndex) private ItemStack getPickedUpItem(int dataIndex)
{ {

21
src/main/java/fr/moribus/imageonmap/guiproko/list/MapListGui.java
View File

@ -46,7 +46,23 @@ public class MapListGui extends ExplorerGui<ImageMap>
return GuiUtils.makeItem(Material.MAP, data.getName(), return GuiUtils.makeItem(Material.MAP, data.getName(),
"Poster map ("+map.getColumnCount()+"x"+map.getRowCount()+")", "#" + data.getId()); "Poster map ("+map.getColumnCount()+"x"+map.getRowCount()+")", "#" + data.getId());
} }
@Override
protected ItemStack getEmptyViewItem()
{
ItemStack empty = new ItemStack(Material.BARRIER);
ItemMeta meta = empty.getItemMeta();
meta.setDisplayName(ChatColor.RED + "You don't have any map.");
meta.setLore(Arrays.asList(
ChatColor.GRAY + "Get started by creating a new one",
ChatColor.GRAY + "using " + ChatColor.WHITE + "/tomap <URL> [resize]" + ChatColor.GRAY + "!"
));
empty.setItemMeta(meta);
return empty;
}
@Override @Override
protected void onRightClick(ImageMap data) protected void onRightClick(ImageMap data)
{ {
@ -124,12 +140,11 @@ public class MapListGui extends ExplorerGui<ImageMap>
lore.add(""); lore.add("");
lore.add(getStatisticText("Current consumption", ((int) Math.rint(percentageUsed)) + " %")); lore.add(getStatisticText("Current consumption", ((int) Math.rint(percentageUsed)) + " %"));
lore.add(getStatisticText("Maps left", mapPartLeft)); lore.add(getStatisticText("Maps left", mapPartLeft));
lore.add("");
meta.setLore(lore); meta.setLore(lore);
} }
fr.moribus.imageonmap.gui.core.GuiUtils.removeVanillaInfos(meta); GuiUtils.hideItemAttributes(meta);
statistics.setItemMeta(meta); statistics.setItemMeta(meta);
action("", getSize() - 5, statistics); action("", getSize() - 5, statistics);