diff --git a/src/main/scala/extracells/gui/GuiFluidTerminal.java b/src/main/scala/extracells/gui/GuiFluidTerminal.java index 3cf214f..4c13837 100644 --- a/src/main/scala/extracells/gui/GuiFluidTerminal.java +++ b/src/main/scala/extracells/gui/GuiFluidTerminal.java @@ -156,10 +156,10 @@ public void initGui() { Mouse.getDWheel(); this.buttonList.clear(); - this.buttonList.add(new GuiButton(0, this.guiLeft - 30, this.guiTop, 30, 20, "9..1")); - this.buttonList.add(new GuiButton(1, this.guiLeft - 30, this.guiTop + 20, 30, 20, "1..9")); - this.buttonList.add(new GuiButton(2, this.guiLeft - 30, this.guiTop + 40, 30, 20, "A..z")); - this.buttonList.add(new GuiButton(3, this.guiLeft - 30, this.guiTop + 60, 30, 20, "z..A")); + this.buttonList.add(new GuiButton(0, this.guiLeft - 30, this.guiTop, 30, 20, "A..z")); + this.buttonList.add(new GuiButton(1, this.guiLeft - 30, this.guiTop + 20, 30, 20, "z..A")); + this.buttonList.add(new GuiButton(2, this.guiLeft - 30, this.guiTop + 40, 30, 20, "1..9")); + this.buttonList.add(new GuiButton(3, this.guiLeft - 30, this.guiTop + 60, 30, 20, "9..1")); updateFluids(); this.searchbar = new GuiTextField(this.fontRendererObj, diff --git a/src/main/scala/extracells/gui/widget/FluidWidgetComparator.java b/src/main/scala/extracells/gui/widget/FluidWidgetComparator.java index cf67f7d..81d8572 100644 --- a/src/main/scala/extracells/gui/widget/FluidWidgetComparator.java +++ b/src/main/scala/extracells/gui/widget/FluidWidgetComparator.java @@ -23,15 +23,15 @@ public FluidWidgetComparator(int _sortingOrder) { public int compare(AbstractFluidWidget o1, AbstractFluidWidget o2) { switch(this.sortingOrder) { case 0: - return ((Long)(((WidgetFluidSelector)o2).getAmount())).compareTo(((WidgetFluidSelector)o1).getAmount()); - case 1: - return ((Long)(((WidgetFluidSelector)o1).getAmount())).compareTo(((WidgetFluidSelector)o2).getAmount()); - case 2: return o1.getFluid().getLocalizedName(new FluidStack(o1.getFluid(), 0)) - .compareTo(o2.getFluid().getLocalizedName(new FluidStack(o2.getFluid(), 0))); - case 3: + .compareTo(o2.getFluid().getLocalizedName(new FluidStack(o2.getFluid(), 0))); + case 1: return o2.getFluid().getLocalizedName(new FluidStack(o2.getFluid(), 0)) .compareTo(o1.getFluid().getLocalizedName(new FluidStack(o1.getFluid(), 0))); + case 2: + return ((Long)(((WidgetFluidSelector)o1).getAmount())).compareTo(((WidgetFluidSelector)o2).getAmount()); + case 3: + return ((Long)(((WidgetFluidSelector)o2).getAmount())).compareTo(((WidgetFluidSelector)o1).getAmount()); } return 0; }