From ae21012d216df71f31aed6fbc9d76215fc24ceed Mon Sep 17 00:00:00 2001 From: Draknyte1 Date: Sat, 4 Mar 2017 12:58:47 +1000 Subject: + New texture for the slow builders ring. + Added the Alkalus Disk. $ Fixed Frame Box Assembler Recipes. $ Fixed Missing 7Li material. $ Fixed Tiered Tanks not showing their capacity in the tooltip. $ Fixed tooltips for alloys containing Bronze or Steel. $ Fixed Clay Pipe Extruder Recipes. - Removed a handful of Plasma cells for misc. materials. % Changed the Industrial Coke Oven's tooltip, to better describe the input/output requirements. % Cleaned up The Entire Project. --- .../gtPlusPlus/core/gui/beta/Gui_ID_Registry.java | 24 +++++----- src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java | 10 ++-- src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java | 54 +++++++++++----------- 3 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src/Java/gtPlusPlus/core/gui/beta') diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java index af3c8a226e..cf1811781a 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java +++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_ID_Registry.java @@ -1,9 +1,9 @@ package gtPlusPlus.core.gui.beta; -import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; - import java.util.*; +import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; + public class Gui_ID_Registry { private static final Map, MU_GuiId> classMap = new HashMap(); @@ -17,25 +17,25 @@ public class Gui_ID_Registry //registerGuiHandlers(MU_GuiType.Entity, Arrays.asList(new Class[] { EntityMinecartApiary.class, EntityMinecartBeehouse.class })); } - private static void registerGuiHandlers(Gui_Types MU_GuiType, List> guiHandlerClasses) + private static void registerGuiHandlers(final Gui_Types MU_GuiType, final List> guiHandlerClasses) { - for (Class tileGuiHandlerClass : guiHandlerClasses) + for (final Class tileGuiHandlerClass : guiHandlerClasses) { - MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass); + final MU_GuiId guiId = new MU_GuiId(nextId++, MU_GuiType, tileGuiHandlerClass); classMap.put(tileGuiHandlerClass, guiId); idMap.put(Integer.valueOf(guiId.getId()), guiId); } } - public static MU_GuiId getGuiIdForGuiHandler(IGuiManagerMiscUtils guiHandler) + public static MU_GuiId getGuiIdForGuiHandler(final IGuiManagerMiscUtils guiHandler) { - Class guiHandlerClass = guiHandler.getClass(); - MU_GuiId guiId = (MU_GuiId)classMap.get(guiHandlerClass); + final Class guiHandlerClass = guiHandler.getClass(); + MU_GuiId guiId = classMap.get(guiHandlerClass); if (guiId == null) { - for (Map.Entry, MU_GuiId> classGuiIdEntry : classMap.entrySet()) { + for (final Map.Entry, MU_GuiId> classGuiIdEntry : classMap.entrySet()) { if (((Class)classGuiIdEntry.getKey()).isAssignableFrom(guiHandlerClass)) { - guiId = (MU_GuiId)classGuiIdEntry.getValue(); + guiId = classGuiIdEntry.getValue(); break; } } @@ -46,9 +46,9 @@ public class Gui_ID_Registry return guiId; } - public static MU_GuiId getGuiId(int id) + public static MU_GuiId getGuiId(final int id) { - return (MU_GuiId)idMap.get(Integer.valueOf(id)); + return idMap.get(Integer.valueOf(id)); } } diff --git a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java index 428cae93d5..9348f40c9c 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java +++ b/src/Java/gtPlusPlus/core/gui/beta/Gui_Types.java @@ -1,8 +1,8 @@ package gtPlusPlus.core.gui.beta; public enum Gui_Types - { - Item, Tile, Entity; - - private Gui_Types() {} - } \ No newline at end of file +{ + Item, Tile, Entity; + + private Gui_Types() {} +} \ No newline at end of file diff --git a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java index 7d17870743..116ad48480 100644 --- a/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java +++ b/src/Java/gtPlusPlus/core/gui/beta/MU_GuiId.java @@ -2,31 +2,31 @@ package gtPlusPlus.core.gui.beta; import gtPlusPlus.core.interfaces.IGuiManagerMiscUtils; public class MU_GuiId - { - private final int id; - private final Gui_Types MU_GuiType; - private final Class guiHandlerClass; - - MU_GuiId(int id, Gui_Types MU_GuiType, Class guiHandlerClass) - { - this.id = id; - this.MU_GuiType = MU_GuiType; - this.guiHandlerClass = guiHandlerClass; - } - - public Gui_Types getGuiType() - { - return this.MU_GuiType; - } - - public Class getGuiHandlerClass() - { - return this.guiHandlerClass; - } - - public int getId() - { - return this.id; - } - } +{ + private final int id; + private final Gui_Types MU_GuiType; + private final Class guiHandlerClass; + + MU_GuiId(final int id, final Gui_Types MU_GuiType, final Class guiHandlerClass) + { + this.id = id; + this.MU_GuiType = MU_GuiType; + this.guiHandlerClass = guiHandlerClass; + } + + public Gui_Types getGuiType() + { + return this.MU_GuiType; + } + + public Class getGuiHandlerClass() + { + return this.guiHandlerClass; + } + + public int getId() + { + return this.id; + } +} -- cgit