diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/eio')
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java | 14 | ||||
| -rw-r--r-- | src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java | 48 |
2 files changed, 28 insertions, 34 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java index 1e96109660..e586bbc0c4 100644 --- a/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/handler/HandlerTooltip_EIO.java @@ -2,14 +2,16 @@ package gtPlusPlus.xmod.eio.handler; import static gtPlusPlus.core.lib.CORE.ConfigSwitches.disableEnderIOIngotTooltips; +import java.lang.reflect.Field; + +import net.minecraft.item.Item; +import net.minecraftforge.event.entity.player.ItemTooltipEvent; + import cpw.mods.fml.common.eventhandler.SubscribeEvent; import gregtech.api.enums.Materials; import gtPlusPlus.core.lib.LoadedMods; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.eio.material.MaterialEIO; -import java.lang.reflect.Field; -import net.minecraft.item.Item; -import net.minecraftforge.event.entity.player.ItemTooltipEvent; public class HandlerTooltip_EIO { @@ -37,14 +39,12 @@ public class HandlerTooltip_EIO { } } } - } catch (Throwable e) { - } + } catch (Throwable e) {} } if (mIngot != null) { // If the Item is an instance of ItemAlloy.class then proceed - if (event.itemStack.getItem() == mIngot - || oIngotClass.isInstance(event.itemStack.getItem()) + if (event.itemStack.getItem() == mIngot || oIngotClass.isInstance(event.itemStack.getItem()) || event.itemStack.getUnlocalizedName().toLowerCase().contains("item.itemAlloy")) { // If stacks match, add a tooltip. diff --git a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java index ea72b6312a..4bf3b3a840 100644 --- a/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java +++ b/src/main/java/gtPlusPlus/xmod/eio/material/MaterialEIO.java @@ -8,7 +8,7 @@ public class MaterialEIO { public static final Material SOULARIUM = new Material( "Soularium", // Material Name MaterialState.SOLID, // State - new short[] {95, 90, 54, 0}, // Material Colour + new short[] { 95, 90, 54, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -16,14 +16,13 @@ public class MaterialEIO { false, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] { - new MaterialStack(ELEMENT.getInstance().GOLD, 1), new MaterialStack(NONMATERIAL.SOULSAND, 1) - }); + new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1), + new MaterialStack(NONMATERIAL.SOULSAND, 1) }); public static final Material CONDUCTIVE_IRON = new Material( "Conductive Iron", // Material Name MaterialState.SOLID, // State - new short[] {164, 109, 100, 0}, // Material Colour + new short[] { 164, 109, 100, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -31,14 +30,13 @@ public class MaterialEIO { false, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] { - new MaterialStack(ELEMENT.getInstance().IRON, 1), new MaterialStack(NONMATERIAL.REDSTONE, 1) - }); + new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1), + new MaterialStack(NONMATERIAL.REDSTONE, 1) }); public static final Material PULSATING_IRON = new Material( "Pulsating Iron", // Material Name MaterialState.SOLID, // State - new short[] {50, 91, 21, 0}, // Material Colour + new short[] { 50, 91, 21, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -46,14 +44,13 @@ public class MaterialEIO { false, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] { - new MaterialStack(ELEMENT.getInstance().IRON, 1), new MaterialStack(NONMATERIAL.ENDERPEARL, 1) - }); + new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().IRON, 1), + new MaterialStack(NONMATERIAL.ENDERPEARL, 1) }); public static final Material ELECTRICAL_STEEL = new Material( "Electrical Steel", // Material Name MaterialState.SOLID, // State - new short[] {194, 194, 194, 0}, // Material Colour + new short[] { 194, 194, 194, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -61,13 +58,13 @@ public class MaterialEIO { true, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] {new MaterialStack(ALLOY.STEEL, 3), new MaterialStack(ELEMENT.getInstance().SILICON, 1) - }); + new MaterialStack[] { new MaterialStack(ALLOY.STEEL, 3), + new MaterialStack(ELEMENT.getInstance().SILICON, 1) }); public static final Material ENERGETIC_ALLOY = new Material( "Energetic Alloy", // Material Name MaterialState.SOLID, // State - new short[] {252, 151, 45, 0}, // Material Colour + new short[] { 252, 151, 45, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -75,16 +72,13 @@ public class MaterialEIO { true, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] { - new MaterialStack(ELEMENT.getInstance().GOLD, 1), - new MaterialStack(NONMATERIAL.REDSTONE, 1), - new MaterialStack(NONMATERIAL.GLOWSTONE, 1) - }); + new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().GOLD, 1), + new MaterialStack(NONMATERIAL.REDSTONE, 1), new MaterialStack(NONMATERIAL.GLOWSTONE, 1) }); public static final Material VIBRANT_ALLOY = new Material( "Vibrant Alloy", // Material Name MaterialState.SOLID, // State - new short[] {204, 242, 142, 0}, // Material Colour + new short[] { 204, 242, 142, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -92,12 +86,13 @@ public class MaterialEIO { true, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] {new MaterialStack(ENERGETIC_ALLOY, 1), new MaterialStack(NONMATERIAL.ENDERPEARL, 1)}); + new MaterialStack[] { new MaterialStack(ENERGETIC_ALLOY, 1), + new MaterialStack(NONMATERIAL.ENDERPEARL, 1) }); public static final Material REDSTONE_ALLOY = new Material( "Redstone Alloy", // Material Name MaterialState.SOLID, // State - new short[] {178, 34, 34, 0}, // Material Colour + new short[] { 178, 34, 34, 0 }, // Material Colour 10, // Melting Point in C 10, 10, @@ -105,7 +100,6 @@ public class MaterialEIO { false, // Uses Blast furnace? false, // Generates a cell // Material Stacks with Percentage of required elements. - new MaterialStack[] { - new MaterialStack(ELEMENT.getInstance().SILICON, 1), new MaterialStack(NONMATERIAL.REDSTONE, 1) - }); + new MaterialStack[] { new MaterialStack(ELEMENT.getInstance().SILICON, 1), + new MaterialStack(NONMATERIAL.REDSTONE, 1) }); } |