From 92cfe8ecf374b2357b21776151762a324cd99ceb Mon Sep 17 00:00:00 2001 From: Matthias Mann Date: Tue, 28 Jul 2015 22:29:33 +0200 Subject: [PATCH] no need for reflection --- .../core/client/gui/button/CycleButton.java | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/enderio/core/client/gui/button/CycleButton.java b/src/main/java/com/enderio/core/client/gui/button/CycleButton.java index f2ad514..76d3ba0 100644 --- a/src/main/java/com/enderio/core/client/gui/button/CycleButton.java +++ b/src/main/java/com/enderio/core/client/gui/button/CycleButton.java @@ -8,10 +8,6 @@ import net.minecraft.client.Minecraft; import com.enderio.core.api.client.gui.IGuiScreen; import com.enderio.core.api.client.render.IWidgetIcon; import com.enderio.core.client.gui.button.CycleButton.ICycleEnum; -import com.google.common.base.Throwables; -import com.google.common.collect.Lists; - -import cpw.mods.fml.relauncher.ReflectionHelper; /** * A button which automatically parses enum constants and cycles between them @@ -35,7 +31,7 @@ public class CycleButton & ICycleEnum> extends IconButton { List getTooltipLines(); } - private T[] modes; + private final T[] modes; @Getter private T mode; @@ -43,11 +39,7 @@ public class CycleButton & ICycleEnum> extends IconButton { @SuppressWarnings("unchecked") public CycleButton(IGuiScreen gui, int id, int x, int y, Class enumClass) { super(gui, id, x, y, null); - try { - modes = (T[]) ReflectionHelper.findMethod(enumClass, null, new String[] { "values" }).invoke(null); - } catch (Exception e) { - Throwables.propagate(e); - } + modes = enumClass.getEnumConstants(); setMode(modes[0]); } @@ -86,7 +78,7 @@ public class CycleButton & ICycleEnum> extends IconButton { return; } mode = newMode; - List tooltip = Lists.newArrayList(mode.getTooltipLines()); + List tooltip = mode.getTooltipLines(); setToolTip(tooltip.toArray(new String[tooltip.size()])); this.icon = mode.getIcon();