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

translations for sidebuttons + basic sidebuttons for grid sorting

Browse Source
This commit is contained in:
Raoul Van den Berge
2015-12-20 18:45:16 +01:00
parent 62c5a1d82f
commit 9cb172e413
12 changed files with 111 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/storagecraft/gui/GuiExporter.java
View File

@@ -19,8 +19,8 @@ public class GuiExporter extends GuiBase {
public void init(int x, int y) {
addSideButton(new SideButtonRedstoneMode(exporter));
addSideButton(new SideButtonCompare(exporter, "NBT", InventoryUtils.COMPARE_NBT));
addSideButton(new SideButtonCompare(exporter, "Damage", InventoryUtils.COMPARE_DAMAGE));
addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_DAMAGE));
addSideButton(new SideButtonCompare(exporter, InventoryUtils.COMPARE_NBT));
}
@Override

14
src/main/java/storagecraft/gui/GuiGrid.java
View File

@@ -9,6 +9,8 @@ import org.lwjgl.input.Keyboard;
import org.lwjgl.input.Mouse;
import storagecraft.StorageCraft;
import storagecraft.container.ContainerGrid;
import storagecraft.gui.sidebutton.SideButtonGridSortingDirection;
import storagecraft.gui.sidebutton.SideButtonGridSortingType;
import storagecraft.gui.sidebutton.SideButtonRedstoneMode;
import storagecraft.network.MessageStoragePull;
import storagecraft.network.MessageStoragePush;
@@ -17,6 +19,15 @@ import storagecraft.tile.TileController;
import storagecraft.tile.TileGrid;
public class GuiGrid extends GuiBase {
public static final int SORTING_DIRECTION_ASCENDING = 0;
public static final int SORTING_DIRECTION_DESCENDING = 1;
public static final int SORTING_TYPE_COUNT = 0;
public static final int SORTING_TYPE_NAME = 1;
public static int SORTING_DIRECTION = SORTING_DIRECTION_ASCENDING;
public static int SORTING_TYPE = SORTING_TYPE_COUNT;
private ContainerGrid container;
private TileGrid grid;
@@ -38,6 +49,9 @@ public class GuiGrid extends GuiBase {
public void init(int x, int y) {
addSideButton(new SideButtonRedstoneMode(grid));
addSideButton(new SideButtonGridSortingDirection());
addSideButton(new SideButtonGridSortingType());
searchField = new GuiTextField(fontRendererObj, x + 80 + 1, y + 6 + 1, 88 - 6, fontRendererObj.FONT_HEIGHT);
searchField.setEnableBackgroundDrawing(false);
searchField.setVisible(true);

4
src/main/java/storagecraft/gui/GuiImporter.java
View File

@@ -20,8 +20,8 @@ public class GuiImporter extends GuiBase {
public void init(int x, int y) {
addSideButton(new SideButtonRedstoneMode(importer));
addSideButton(new SideButtonCompare(importer, "NBT", InventoryUtils.COMPARE_NBT));
addSideButton(new SideButtonCompare(importer, "Damage", InventoryUtils.COMPARE_DAMAGE));
addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_DAMAGE));
addSideButton(new SideButtonCompare(importer, InventoryUtils.COMPARE_NBT));
addSideButton(new SideButtonImporterMode(importer));
}

10
src/main/java/storagecraft/gui/sidebutton/SideButtonCompare.java
View File

@@ -8,12 +8,10 @@ import storagecraft.tile.ICompareSetting;
public class SideButtonCompare extends SideButton {
private ICompareSetting setting;
private String name;
private int mask;
public SideButtonCompare(ICompareSetting setting, String name, int mask) {
public SideButtonCompare(ICompareSetting setting, int mask) {
this.setting = setting;
this.name = name;
this.mask = mask;
}
@@ -21,12 +19,12 @@ public class SideButtonCompare extends SideButton {
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(EnumChatFormatting.YELLOW).append(gui.t("misc.storagecraft:compare" + name)).append(EnumChatFormatting.RESET).append("\n");
builder.append(EnumChatFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:compare." + mask)).append(EnumChatFormatting.RESET).append("\n");
if ((setting.getCompare() & mask) == mask) {
builder.append(gui.t("misc.storagecraft:on"));
builder.append(gui.t("misc.storagecraft:yes"));
} else {
builder.append(gui.t("misc.storagecraft:off"));
builder.append(gui.t("misc.storagecraft:no"));
}
return builder.toString();

27
src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingDirection.java Normal file
View File

@@ -0,0 +1,27 @@
package storagecraft.gui.sidebutton;
import net.minecraft.util.EnumChatFormatting;
import storagecraft.gui.GuiBase;
import storagecraft.gui.GuiGrid;
public class SideButtonGridSortingDirection extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(EnumChatFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.direction")).append(EnumChatFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.storagecraft:sorting.direction." + GuiGrid.SORTING_DIRECTION));
return builder.toString();
}
@Override
public void draw(GuiBase gui, int x, int y) {
}
@Override
public void actionPerformed() {
GuiGrid.SORTING_DIRECTION = GuiGrid.SORTING_DIRECTION == GuiGrid.SORTING_DIRECTION_ASCENDING ? GuiGrid.SORTING_DIRECTION_DESCENDING : GuiGrid.SORTING_DIRECTION_ASCENDING;
}
}

27
src/main/java/storagecraft/gui/sidebutton/SideButtonGridSortingType.java Normal file
View File

@@ -0,0 +1,27 @@
package storagecraft.gui.sidebutton;
import net.minecraft.util.EnumChatFormatting;
import storagecraft.gui.GuiBase;
import storagecraft.gui.GuiGrid;
public class SideButtonGridSortingType extends SideButton {
@Override
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(EnumChatFormatting.YELLOW).append(gui.t("sidebutton.storagecraft:sorting.type")).append(EnumChatFormatting.RESET).append("\n");
builder.append(gui.t("sidebutton.storagecraft:sorting.type." + GuiGrid.SORTING_TYPE));
return builder.toString();
}
@Override
public void draw(GuiBase gui, int x, int y) {
}
@Override
public void actionPerformed() {
GuiGrid.SORTING_TYPE = GuiGrid.SORTING_TYPE == GuiGrid.SORTING_TYPE_COUNT ? GuiGrid.SORTING_TYPE_NAME : GuiGrid.SORTING_TYPE_COUNT;
}
}

4
src/main/java/storagecraft/gui/sidebutton/SideButtonImporterMode.java
View File

@@ -17,9 +17,9 @@ public class SideButtonImporterMode extends SideButton {
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(EnumChatFormatting.GREEN).append("Mode").append(EnumChatFormatting.RESET).append("\n");
builder.append(EnumChatFormatting.GREEN).append(gui.t("sidebutton.storagecraft:importer.mode")).append(EnumChatFormatting.RESET).append("\n");
builder.append(gui.t("misc.storagecraft:importer.mode." + importer.getMode()));
builder.append(gui.t("sidebutton.storagecraft:importer.mode." + importer.getMode()));
return builder.toString();
}

4
src/main/java/storagecraft/gui/sidebutton/SideButtonRedstoneMode.java
View File

@@ -19,9 +19,9 @@ public class SideButtonRedstoneMode extends SideButton {
public String getTooltip(GuiBase gui) {
StringBuilder builder = new StringBuilder();
builder.append(EnumChatFormatting.RED).append("Redstone Mode").append(EnumChatFormatting.RESET).append("\n");
builder.append(EnumChatFormatting.RED).append(gui.t("sidebutton.storagecraft:redstoneMode")).append(EnumChatFormatting.RESET).append("\n");
builder.append(gui.t("misc.storagecraft:redstoneMode." + setting.getRedstoneMode().id));
builder.append(gui.t("sidebutton.storagecraft:redstoneMode." + setting.getRedstoneMode().id));
return builder.toString();
}

16
src/main/java/storagecraft/storage/StorageItem.java
View File

@@ -104,14 +104,14 @@ public class StorageItem {
}
public boolean compare(StorageItem other, int flags) {
if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) {
if (tag != null && !tag.equals(other.getTag())) {
if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) {
if (damage != other.getDamage()) {
return false;
}
}
if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) {
if (damage != other.getDamage()) {
if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) {
if (tag != null && !tag.equals(other.getTag())) {
return false;
}
}
@@ -126,14 +126,14 @@ public class StorageItem {
}
public boolean compare(ItemStack stack, int flags) {
if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) {
if (tag != null && !tag.equals(stack.stackTagCompound)) {
if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) {
if (damage != stack.getItemDamage()) {
return false;
}
}
if ((flags & InventoryUtils.COMPARE_DAMAGE) == InventoryUtils.COMPARE_DAMAGE) {
if (damage != stack.getItemDamage()) {
if ((flags & InventoryUtils.COMPARE_NBT) == InventoryUtils.COMPARE_NBT) {
if (tag != null && !tag.equals(stack.stackTagCompound)) {
return false;
}
}

8
src/main/java/storagecraft/util/InventoryUtils.java
View File

@@ -171,14 +171,14 @@ public class InventoryUtils {
}
public static boolean compareStack(ItemStack first, ItemStack second, int flags) {
if ((flags & COMPARE_NBT) == COMPARE_NBT) {
if (first.stackTagCompound != null && !first.stackTagCompound.equals(second.stackTagCompound)) {
if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE) {
if (first.getItemDamage() != second.getItemDamage()) {
return false;
}
}
if ((flags & COMPARE_DAMAGE) == COMPARE_DAMAGE) {
if (first.getItemDamage() != second.getItemDamage()) {
if ((flags & COMPARE_NBT) == COMPARE_NBT) {
if (first.stackTagCompound != null && !first.stackTagCompound.equals(second.stackTagCompound)) {
return false;
}
}