diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java b/src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java index 020ada36..ed987cee 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java +++ b/src/main/java/de/johni0702/minecraft/gui/layout/CustomLayout.java @@ -22,7 +22,6 @@ package de.johni0702.minecraft.gui.layout; -import com.google.common.collect.Maps; import de.johni0702.minecraft.gui.container.GuiContainer; import de.johni0702.minecraft.gui.element.GuiElement; import org.apache.commons.lang3.tuple.Pair; @@ -32,11 +31,12 @@ import org.lwjgl.util.ReadableDimension; import org.lwjgl.util.ReadablePoint; import java.util.Collection; +import java.util.LinkedHashMap; import java.util.Map; public abstract class CustomLayout> implements Layout { private final Layout parent; - private Map> result = Maps.newHashMap(); + private Map> result = new LinkedHashMap<>(); public CustomLayout() { this(null); diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java b/src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java index c6fa6e08..ff5cae99 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java +++ b/src/main/java/de/johni0702/minecraft/gui/layout/GridLayout.java @@ -23,7 +23,6 @@ package de.johni0702.minecraft.gui.layout; import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; import de.johni0702.minecraft.gui.container.GuiContainer; import de.johni0702.minecraft.gui.element.GuiElement; import lombok.AllArgsConstructor; @@ -38,6 +37,7 @@ import org.lwjgl.util.ReadablePoint; import java.util.Collections; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.Map; public class GridLayout implements Layout { @@ -63,7 +63,7 @@ public class GridLayout implements Layout { } int cellWidth = (size.getWidth() + spacingX) / columns - spacingX; int cellHeight = (size.getHeight() + spacingY) / rows - spacingY; - Map> map = Maps.newHashMap(); + Map> map = new LinkedHashMap<>(); Iterator> iter = container.getElements().entrySet().iterator(); for (int i = 0; i < rows; i++) { for (int j = 0; j < columns; j++) { diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java b/src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java index 1f2a80d0..78aed971 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java +++ b/src/main/java/de/johni0702/minecraft/gui/layout/HorizontalLayout.java @@ -22,7 +22,6 @@ package de.johni0702.minecraft.gui.layout; -import com.google.common.collect.Maps; import de.johni0702.minecraft.gui.container.GuiContainer; import de.johni0702.minecraft.gui.element.GuiElement; import lombok.AllArgsConstructor; @@ -35,6 +34,7 @@ import org.lwjgl.util.Point; import org.lwjgl.util.ReadableDimension; import org.lwjgl.util.ReadablePoint; +import java.util.LinkedHashMap; import java.util.Map; public class HorizontalLayout implements Layout { @@ -59,7 +59,7 @@ public class HorizontalLayout implements Layout { public Map> layOut(GuiContainer container, ReadableDimension size) { int x = 0; int spacing = 0; - Map> map = Maps.newHashMap(); + Map> map = new LinkedHashMap<>(); for (Map.Entry entry : container.getElements().entrySet()) { x += spacing; spacing = this.spacing; diff --git a/src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java b/src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java index 5a333201..d2e28cdd 100644 --- a/src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java +++ b/src/main/java/de/johni0702/minecraft/gui/layout/VerticalLayout.java @@ -22,7 +22,6 @@ package de.johni0702.minecraft.gui.layout; -import com.google.common.collect.Maps; import de.johni0702.minecraft.gui.container.GuiContainer; import de.johni0702.minecraft.gui.element.GuiElement; import lombok.AllArgsConstructor; @@ -35,6 +34,7 @@ import org.lwjgl.util.Point; import org.lwjgl.util.ReadableDimension; import org.lwjgl.util.ReadablePoint; +import java.util.LinkedHashMap; import java.util.Map; public class VerticalLayout implements Layout { @@ -59,7 +59,7 @@ public class VerticalLayout implements Layout { public Map> layOut(GuiContainer container, ReadableDimension size) { int y = 0; int spacing = 0; - Map> map = Maps.newHashMap(); + Map> map = new LinkedHashMap<>(); for (Map.Entry entry : container.getElements().entrySet()) { y += spacing; spacing = this.spacing;