dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't use stringbuilder in sidebuttons

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-04-02 16:35:13 +02:00
parent b3fd6d1c72
commit f6812ee809
8 changed files with 13 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/gui/GuiGrid.java
View File

@@ -265,9 +265,11 @@ public class GuiGrid extends GuiBase {
if (clickedButton == 1) {
flags |= MessageStoragePull.PULL_HALF;
}
if (GuiScreen.isShiftKeyDown()) {
flags |= MessageStoragePull.PULL_SHIFT;
}
if (clickedButton == 2) {
flags |= MessageStoragePull.PULL_ONE;
}

12
src/main/java/refinedstorage/gui/sidebutton/SideButtonCompare.java
View File

@@ -18,17 +18,15 @@ public class SideButtonCompare extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:compare." + mask)).append(TextFormatting.RESET).append("\n");
String tooltip = TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:compare." + mask) + TextFormatting.RESET + "\n";
if ((config.getCompare() & mask) == mask) {
builder.append(gui.t("misc.refinedstorage:yes"));
tooltip += gui.t("misc.refinedstorage:yes");
} else {
builder.append(gui.t("misc.refinedstorage:no"));
tooltip += gui.t("misc.refinedstorage:no");
}
return builder.toString();
return tooltip;
}
@Override
@@ -45,7 +43,7 @@ public class SideButtonCompare extends SideButton {
int tx = (config.getCompare() & mask) == mask ? 0 : 16;
gui.drawTexture(x, y + 2, tx, ty, 16, 16);
gui.drawTexture(x, y + 1, tx, ty, 16, 16);
}
@Override

7
src/main/java/refinedstorage/gui/sidebutton/SideButtonDetectorMode.java
View File

@@ -17,12 +17,7 @@ public class SideButtonDetectorMode extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:detector.mode")).append(TextFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode()));
return builder.toString();
return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:detector.mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:detector.mode." + detector.getMode());
}
@Override

7
src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSearchBoxMode.java
View File

@@ -14,12 +14,7 @@ public class SideButtonGridSearchBoxMode extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:grid.search_box_mode")).append(TextFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.refinedstorage:grid.search_box_mode." + grid.getSearchBoxMode()));
return builder.toString();
return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.search_box_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.search_box_mode." + grid.getSearchBoxMode());
}
@Override

7
src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingDirection.java
View File

@@ -14,12 +14,7 @@ public class SideButtonGridSortingDirection extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:grid.sorting.direction")).append(TextFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection()));
return builder.toString();
return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.sorting.direction") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.sorting.direction." + grid.getSortingDirection());
}
@Override

7
src/main/java/refinedstorage/gui/sidebutton/SideButtonGridSortingType.java
View File

@@ -14,12 +14,7 @@ public class SideButtonGridSortingType extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.YELLOW).append(gui.t("sidebutton.refinedstorage:grid.sorting.type")).append(TextFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType()));
return builder.toString();
return TextFormatting.YELLOW + gui.t("sidebutton.refinedstorage:grid.sorting.type") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:grid.sorting.type." + grid.getSortingType());
}
@Override

7
src/main/java/refinedstorage/gui/sidebutton/SideButtonMode.java
View File

@@ -15,12 +15,7 @@ public class SideButtonMode extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.GREEN).append(gui.t("sidebutton.refinedstorage:mode")).append(TextFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.refinedstorage:mode." + (config.isWhitelist() ? "whitelist" : "blacklist")));
return builder.toString();
return TextFormatting.GREEN + gui.t("sidebutton.refinedstorage:mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:mode." + (config.isWhitelist() ? "whitelist" : "blacklist"));
}
@Override

7
src/main/java/refinedstorage/gui/sidebutton/SideButtonRedstoneMode.java
View File

@@ -15,12 +15,7 @@ public class SideButtonRedstoneMode extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(TextFormatting.RED).append(gui.t("sidebutton.refinedstorage:redstone_mode")).append(TextFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.refinedstorage:redstone_mode." + config.getRedstoneMode().id));
return builder.toString();
return TextFormatting.RED + gui.t("sidebutton.refinedstorage:redstone_mode") + TextFormatting.RESET + "\n" + gui.t("sidebutton.refinedstorage:redstone_mode." + config.getRedstoneMode().id);
}
@Override