Skip to content

Commit 9ec9630

Browse files
committed
improved interface for non-op users
1 parent 41d94ec commit 9ec9630

5 files changed

Lines changed: 29 additions & 10 deletions

File tree

src/main/java/ua/leonidius/trdinterface/Message.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ public enum Message {
3434
MENU_SELL("Sell items"),
3535
MENU_EDIT_BUY_LIST("Edit buyable items"),
3636
MENU_EDIT_SELL_LIST("Edit sellable items"),
37+
MENU_BROWSE_SELL_LIST("Browse sellable items"),
3738
// EDITED IN 2.0.0
3839
MENU_CUSTOM_NAMES("Custom item translations"),
3940
// end of edited stuff
@@ -81,6 +82,9 @@ public enum Message {
8182
WDW_SELL_SELECT_ITEM("Select an item to sell"),
8283
WDW_SELL_NOTHING("You have nothing to sell."),
8384
BTN_ITEM_SELL("%1% (%2%%3%) (x%4%)"), // edited in 2.0.0
85+
WDW_BROWSE_SELLABLE_ITEMS_TITLE("Browsing sellable items"),
86+
WDW_VIEWING_BUYABLE_ITEM("Viewing a buyable item"),
87+
WDW_VIEWING_SELLABLE_ITEM("Viewing a sellable item"),
8488

8589
// Sell window
8690
WDW_SELL_TITLE("Selling %1%"),

src/main/java/ua/leonidius/trdinterface/controllers/buy/items/BuyAmountSelectorController.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,14 @@ public void showScreen() {
3030
int maxByInventory = getMaxByInventory();
3131

3232
if (maxByMoney == 0 && maxByInventory == 0) {
33-
showInfoScreen(Message.BUY_NO_SPACE_AND_MONEY.getText());
33+
showInfoScreen(buildItemDescription()
34+
+ "\n\n" + Message.BUY_NO_SPACE_AND_MONEY.getText());
3435
} else if (maxByMoney == 0) {
35-
showInfoScreen(Message.BUY_NO_MONEY.getText());
36+
showInfoScreen(buildItemDescription()
37+
+ "\n\n" + Message.BUY_NO_MONEY.getText());
3638
} else if (maxByInventory == 0) {
37-
showInfoScreen(Message.BUY_NO_SPACE.getText());
39+
showInfoScreen(buildItemDescription()
40+
+ "\n\n" + Message.BUY_NO_SPACE.getText());
3841
} else {
3942
int maxAmount = Math.min(maxByInventory, maxByMoney);
4043
manager.addAndShow(new AmountSelectorScreen(this,

src/main/java/ua/leonidius/trdinterface/controllers/sell/SellableItemsListController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ public void showScreen() {
3434

3535
if (manager.getPlayer().hasPermission("shop.edit")) {
3636
buttons.put(Message.MENU_EDIT_SELL_LIST.getText(), this::editList);
37+
} else {
38+
buttons.put(Message.MENU_BROWSE_SELL_LIST.getText(), this::editList);
3739
}
3840

3941
manager.addAndShow(new ListScreen<>(this,

src/main/java/ua/leonidius/trdinterface/controllers/sell/edit/ManageSellableItemController.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public void showScreen() {
2222
manager.addAndShow(new ManageSellableItemScreen(this));
2323
}
2424

25+
public boolean showEditingButtons() {
26+
// TODO: check divided permissions
27+
return manager.getPlayer().hasPermission("shop.edit");
28+
}
29+
2530
@Override
2631
protected SellableItem getItem() {
2732
return item;

src/main/java/ua/leonidius/trdinterface/views/screens/sell/edit/ManageSellableItemScreen.java

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,21 @@ public class ManageSellableItemScreen extends SimpleScreen {
1010
private final transient ManageSellableItemController controller;
1111

1212
public ManageSellableItemScreen(ManageSellableItemController controller) {
13-
super(Message.WDW_EDIT_ITEM_TITLE.getText());
13+
super(controller.showEditingButtons()
14+
? Message.WDW_EDIT_ITEM_TITLE.getText()
15+
: Message.WDW_VIEWING_SELLABLE_ITEM.getText());
1416
this.controller = controller;
1517

1618
addButton(new CallbackButton(Message.BTN_BACK.getText(), controller::back));
17-
addButton(new CallbackButton(Message.BTN_EDIT_ITEM.getText(),
18-
controller::editItem));
19-
addButton(new CallbackButton(Message.BTN_MANAGE_ENCHANTMENTS.getText(),
20-
controller::manageEnchantments));
21-
addButton(new CallbackButton(Message.BTN_DELETE_ITEM.getText(),
22-
controller::deleteItem));
19+
20+
if (controller.showEditingButtons()) {
21+
addButton(new CallbackButton(Message.BTN_EDIT_ITEM.getText(),
22+
controller::editItem));
23+
addButton(new CallbackButton(Message.BTN_MANAGE_ENCHANTMENTS.getText(),
24+
controller::manageEnchantments));
25+
addButton(new CallbackButton(Message.BTN_DELETE_ITEM.getText(),
26+
controller::deleteItem));
27+
}
2328
}
2429

2530
@Override

0 commit comments

Comments
 (0)