diff options
Diffstat (limited to 'src/main/java/gregtech/api/gui/widgets')
3 files changed, 15 insertions, 18 deletions
diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java index 01c8671678..cb149547b4 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiIcon.java @@ -119,10 +119,8 @@ public enum GT_GuiIcon implements IGuiIcon { if (location == null || location.length == 0) return; int startIndex = TEXTURES.length; - TEXTURES = (ResourceLocation[]) Arrays.copyOf(TEXTURES, location.length); - for (int i = 0; i < location.length; i++) { - TEXTURES[startIndex + i] = location[i]; - } + TEXTURES = Arrays.copyOf(TEXTURES, location.length); + System.arraycopy(location, 0, TEXTURES, startIndex + 0, location.length); } @Override diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java index 9caf51cd4b..01a0f3c8b1 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTabLine.java @@ -34,7 +34,7 @@ public class GT_GuiTabLine { /** * Controls the rendering style of the tab line */ - public static enum DisplayStyle { + public enum DisplayStyle { NONE((byte) 0), NORMAL((byte) 1), @@ -189,9 +189,9 @@ public class GT_GuiTabLine { * @param mouseY */ protected void drawOverlays(float parTicks, int mouseX, int mouseY) { - for (int i = 0; i < mTabs.length; i++) { - if (mTabs[i] != null) { - mTabs[i].drawOverlays(mouseX, mouseY, parTicks); + for (GT_GuiTab mTab : mTabs) { + if (mTab != null) { + mTab.drawOverlays(mouseX, mouseY, parTicks); } } } @@ -204,9 +204,9 @@ public class GT_GuiTabLine { * @param mouseY */ protected void drawBackground(float parTicks, int mouseX, int mouseY) { - for (int i = 0; i < mTabs.length; i++) { - if (mTabs[i] != null) { - mTabs[i].drawBackground(mouseX, mouseY, parTicks); + for (GT_GuiTab mTab : mTabs) { + if (mTab != null) { + mTab.drawBackground(mouseX, mouseY, parTicks); } } } diff --git a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java index 1162630d5e..326e744382 100644 --- a/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java +++ b/src/main/java/gregtech/api/gui/widgets/GT_GuiTooltip.java @@ -2,7 +2,6 @@ package gregtech.api.gui.widgets; import java.awt.Rectangle; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; import java.util.List; @@ -44,10 +43,10 @@ public class GT_GuiTooltip { private TooltipData sanitizeTooltipData(TooltipData data) { if (data.text == null) { - data.text = Arrays.asList(new String[0]); + data.text = Collections.emptyList(); } if (data.shiftText == null) { - data.shiftText = Arrays.asList(new String[0]); + data.shiftText = Collections.emptyList(); } return data; } @@ -97,10 +96,10 @@ public class GT_GuiTooltip { List<String> list; if (text != null) { list = new ArrayList<>(text.length); - for (int i = 0; i < text.length; i++) { - if (text[i] == null) continue; - if (list.isEmpty()) list.add("\u00a7f" + text[i]); - else list.add("\u00a77" + text[i]); + for (String s : text) { + if (s == null) continue; + if (list.isEmpty()) list.add("\u00a7f" + s); + else list.add("\u00a77" + s); } } else { list = Collections.emptyList(); |