DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Allow sorting of children of a GuiContainer

Browse Source
This commit is contained in:
johni0702
2015-10-11 11:10:34 +02:00
parent d64ea95089
commit d8a3df1f02
2 changed files with 39 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/de/johni0702/minecraft/gui/container/AbstractGuiContainer.java
View File

@@ -22,6 +22,8 @@
package de.johni0702.minecraft.gui.container;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Ordering;
import de.johni0702.minecraft.gui.GuiRenderer;
import de.johni0702.minecraft.gui.OffsetGuiRenderer;
import de.johni0702.minecraft.gui.RenderInfo;
@@ -40,10 +42,7 @@ import org.lwjgl.util.ReadableColor;
import org.lwjgl.util.ReadableDimension;
import org.lwjgl.util.ReadablePoint;
import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.*;
import java.util.concurrent.Callable;
import static com.google.common.base.Preconditions.checkState;
@@ -219,6 +218,39 @@ public abstract class AbstractGuiContainer<T extends AbstractGuiContainer<T>>
return layout.calcMinSize(this);
}
@Override
public T sortElements() {
sortElements(new Comparator<GuiElement>() {
@SuppressWarnings("unchecked")
@Override
public int compare(GuiElement o1, GuiElement o2) {
if (o1 instanceof Comparable && o2 instanceof Comparable) {
return ((Comparable) o1).compareTo(o2);
}
return o1.hashCode() - o2.hashCode();
}
});
return getThis();
}
@Override
public T sortElements(final Comparator<GuiElement> comparator) {
Ordering<Map.Entry<GuiElement, LayoutData>> ordering = new Ordering<Map.Entry<GuiElement, LayoutData>>() {
@Override
public int compare(Map.Entry<GuiElement, LayoutData> left, Map.Entry<GuiElement, LayoutData> right) {
return comparator.compare(left.getKey(), right.getKey());
}
};
if (!ordering.isOrdered(elements.entrySet())) {
ImmutableList<Map.Entry<GuiElement, LayoutData>> sorted = ordering.immutableSortedCopy(elements.entrySet());
elements.clear();
for (Map.Entry<GuiElement, LayoutData> entry : sorted) {
elements.put(entry.getKey(), entry.getValue());
}
}
return getThis();
}
@Override
public ReadableColor getBackgroundColor() {
return backgroundColor;

3
src/main/java/de/johni0702/minecraft/gui/container/GuiContainer.java
View File

@@ -29,6 +29,7 @@ import de.johni0702.minecraft.gui.layout.LayoutData;
import org.lwjgl.util.Point;
import org.lwjgl.util.ReadableColor;
import java.util.Comparator;
import java.util.Map;
public interface GuiContainer<T extends GuiContainer<T>> extends ComposedGuiElement<T> {
@@ -41,6 +42,8 @@ public interface GuiContainer<T extends GuiContainer<T>> extends ComposedGuiElem
Map<GuiElement, LayoutData> getElements();
T addElements(LayoutData layoutData, GuiElement...elements);
T removeElement(GuiElement element);
T sortElements();
T sortElements(Comparator<GuiElement> comparator);
ReadableColor getBackgroundColor();
T setBackgroundColor(ReadableColor backgroundColor);