diff options
Diffstat (limited to 'src/main/java/gtPlusPlus/xmod/gregtech/api/enums')
7 files changed, 377 insertions, 1766 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java index a31e728e23..74c9d9ee5b 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomGtTextures.java @@ -1,22 +1,25 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; import gregtech.api.objects.GT_RenderedTexture; import gtPlusPlus.core.lib.CORE; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class CustomGtTextures { + public enum ItemIcons implements IIconContainer, Runnable { + VOID, // The Empty Texture RENDERING_ERROR, PUMP, SKOOKUMCHOOCHER; - public static final ITexture[] ERROR_RENDERING = new ITexture[] {new GT_RenderedTexture(RENDERING_ERROR)}; + public static final ITexture[] ERROR_RENDERING = new ITexture[] { new GT_RenderedTexture(RENDERING_ERROR) }; protected IIcon mIcon, mOverlay; @@ -46,6 +49,7 @@ public class CustomGtTextures { } public static class CustomIcon implements IIconContainer, Runnable { + protected IIcon mIcon, mOverlay; protected String mIconName; diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java index c0c4e6a5c8..fcbbd019a9 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/CustomOrePrefix.java @@ -2,28 +2,14 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.B; -import gregtech.api.enums.OrePrefixes; import net.minecraftforge.common.util.EnumHelper; +import gregtech.api.enums.OrePrefixes; + public enum CustomOrePrefix { - milled( - "Milled Ores", - "Milled ", - " Ore", - true, - true, - false, - false, - false, - false, - false, - false, - false, - true, - B[3], - -1, - 64, - -1); + + milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], + -1, 64, -1); private final String mRegularLocalName; private final String mLocalizedMaterialPre; @@ -45,24 +31,11 @@ public enum CustomOrePrefix { private OrePrefixes mSelfReference; - private CustomOrePrefix( - String aRegularLocalName, - String aLocalizedMaterialPre, - String aLocalizedMaterialPost, - boolean aIsUnificatable, - boolean aIsMaterialBased, - boolean aIsSelfReferencing, - boolean aIsContainer, - boolean aDontUnificateActively, - boolean aIsUsedForBlocks, - boolean aAllowNormalRecycling, - boolean aGenerateDefaultItem, - boolean aIsEnchantable, - boolean aIsUsedForOreProcessing, - int aMaterialGenerationBits, - long aMaterialAmount, - int aDefaultStackSize, - int aTextureindex) { + private CustomOrePrefix(String aRegularLocalName, String aLocalizedMaterialPre, String aLocalizedMaterialPost, + boolean aIsUnificatable, boolean aIsMaterialBased, boolean aIsSelfReferencing, boolean aIsContainer, + boolean aDontUnificateActively, boolean aIsUsedForBlocks, boolean aAllowNormalRecycling, + boolean aGenerateDefaultItem, boolean aIsEnchantable, boolean aIsUsedForOreProcessing, + int aMaterialGenerationBits, long aMaterialAmount, int aDefaultStackSize, int aTextureindex) { mRegularLocalName = aRegularLocalName; mLocalizedMaterialPre = aLocalizedMaterialPre; @@ -88,44 +61,13 @@ public enum CustomOrePrefix { mSelfReference = EnumHelper.addEnum( OrePrefixes.class, this.name(), - new Class[] { - String.class, - String.class, - String.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - boolean.class, - int.class, - long.class, - int.class, - int.class - }, - new Object[] { - mRegularLocalName, - mLocalizedMaterialPre, - mLocalizedMaterialPost, - mIsUnificatable, - mIsMaterialBased, - mIsSelfReferencing, - mIsContainer, - mDontUnificateActively, - mIsUsedForBlocks, - mAllowNormalRecycling, - mGenerateDefaultItem, - mIsEnchantable, - mIsUsedForOreProcessing, - mMaterialGenerationBits, - mMaterialAmount, - mDefaultStackSize, - mTextureindex - }); + new Class[] { String.class, String.class, String.class, boolean.class, boolean.class, boolean.class, + boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, boolean.class, + boolean.class, int.class, long.class, int.class, int.class }, + new Object[] { mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost, mIsUnificatable, + mIsMaterialBased, mIsSelfReferencing, mIsContainer, mDontUnificateActively, mIsUsedForBlocks, + mAllowNormalRecycling, mGenerateDefaultItem, mIsEnchantable, mIsUsedForOreProcessing, + mMaterialGenerationBits, mMaterialAmount, mDefaultStackSize, mTextureindex }); return mSelfReference != null; } diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java index 355b1c7477..2506af7af5 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java @@ -2,15 +2,16 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.W; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_OreDictUnificator; -import gregtech.api.util.GT_Utility; -import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; import net.minecraft.block.Block; import net.minecraft.init.Blocks; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; +import gregtech.api.util.GT_ModHandler; +import gregtech.api.util.GT_OreDictUnificator; +import gregtech.api.util.GT_Utility; +import gtPlusPlus.xmod.gregtech.api.interfaces.GregtechItemContainer; + /** * Class containing all non-OreDict Items of GregTech. */ @@ -308,7 +309,7 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Reactor_II, // Multitank - /*Industrial_MultiTank,*/ + /* Industrial_MultiTank, */ Industrial_MultiTankDense, Casing_MultitankExterior, @@ -379,9 +380,9 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Multi_Use, // Bedrock Mining Platforms - /*BedrockMiner_MKI, */ - /*BedrockMiner_MKII, */ - /*BedrockMiner_MKIII, */ + /* BedrockMiner_MKI, */ + /* BedrockMiner_MKII, */ + /* BedrockMiner_MKIII, */ Casing_BedrockMiner, // Large Packager @@ -413,7 +414,7 @@ public enum GregtechItemList implements GregtechItemContainer { Casing_Naq_Reactor_A, Casing_Naq_Reactor_B, Casing_Naq_Reactor_C, - /*Controller_Naq_Reactor, */ + /* Controller_Naq_Reactor, */ Casing_Containment, // Arc Furnace @@ -757,7 +758,7 @@ public enum GregtechItemList implements GregtechItemContainer { Charger_MAX, // Tiny Fusion - /*Miniature_Fusion, */ + /* Miniature_Fusion, */ // Component Makers Machine_LV_Component_Maker, @@ -932,7 +933,7 @@ public enum GregtechItemList implements GregtechItemContainer { GT_Chisel_HV, // Plasma Tank - /*Plasma_Tank,*/ + /* Plasma_Tank, */ // ---------------------------------------------------------------------------- @@ -968,11 +969,11 @@ public enum GregtechItemList implements GregtechItemContainer { FakeMachineCasingPlate_UV, FakeMachineCasingPlate_MAX, -// ---------------------------------------------------------------------------- + // ---------------------------------------------------------------------------- -; + ; - public static final GregtechItemList[] DYE_ONLY_ITEMS = {Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV}; + public static final GregtechItemList[] DYE_ONLY_ITEMS = { Energy_Buffer_1by1_EV, Energy_Buffer_1by1_EV }; private ItemStack mStack; private boolean mHasNotBeenSet = true; @@ -1028,8 +1029,8 @@ public enum GregtechItemList implements GregtechItemContainer { if (GT_Utility.isStackInvalid(aStack)) { return false; } - return GT_Utility.areUnificationsEqual( - (ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); + return GT_Utility + .areUnificationsEqual((ItemStack) aStack, aWildcard ? this.getWildcard(1) : this.get(1), aIgnoreNBT); } public static Block getBlockFromStack(Object aStack) { @@ -1078,8 +1079,8 @@ public enum GregtechItemList implements GregtechItemContainer { if (GT_Utility.isStackInvalid(this.mStack)) { return GT_Utility.copyAmount(aAmount, aReplacements); } - return GT_Utility.copyAmountAndMetaData( - aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); + return GT_Utility + .copyAmountAndMetaData(aAmount, this.mStack.getMaxDamage() - 1, GT_OreDictUnificator.get(this.mStack)); } @Override diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java index b535236575..4bd8831098 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOreDictNames.java @@ -1,29 +1,18 @@ package gtPlusPlus.xmod.gregtech.api.enums; -/* Electric Components. - * - * usual Materials for this are: - * Primitive (Tier 1) - * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery - * Good (Tier 3) - * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery - * Data (Tier 5) : Data Storage Circuit - * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit - * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal - * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb - * Infinite (Cheaty) - * -Circuits - Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, - Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, - Circuit_IV, Circuit_LuV, Circuit_ZPM, -Circuit Parts - Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, - Circuit_Parts_Crystal_Chip_IV, Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, - Circuit_Parts_IV, Circuit_Parts_LuV, Circuit_Parts_ZPM, - Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM; +/* + * Electric Components. usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used by UE as well : IC2 + * Circuit and RE-Battery Good (Tier 3) Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and + * Lithium Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE as well : Energy Crystal and Data + * Control Circuit Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb and + * Lapotronic Energy Orb Infinite (Cheaty) Circuits Circuit_Primitive, Circuit_Basic, Circuit_Good, Circuit_Advanced, + * Circuit_Data, Circuit_Elite, Circuit_Master, Tool_DataOrb, Circuit_Ultimate, Tool_DataStick, Circuit_IV, Circuit_LuV, + * Circuit_ZPM, Circuit Parts Circuit_Board_IV, Circuit_Board_LuV, Circuit_Board_ZPM, Circuit_Parts_Crystal_Chip_IV, + * Circuit_Parts_Crystal_Chip_LuV, Circuit_Parts_Crystal_Chip_ZPM, Circuit_Parts_IV, Circuit_Parts_LuV, + * Circuit_Parts_ZPM, Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM; */ public enum GregtechOreDictNames { + buffer_core, itemGregConduit, Circuit_IV, diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java index 03d2741fe3..f71e07f0a3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java @@ -3,6 +3,13 @@ package gtPlusPlus.xmod.gregtech.api.enums; import static gregtech.api.enums.GT_Values.*; import static gtPlusPlus.core.util.Utils.getTcAspectStack; +import java.util.*; + +import net.minecraft.enchantment.Enchantment; +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidStack; + import gregtech.api.enums.*; import gregtech.api.enums.TC_Aspects.TC_AspectStack; import gregtech.api.interfaces.*; @@ -13,486 +20,88 @@ import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_OreRecipeRegistrator; import gtPlusPlus.xmod.gregtech.api.objects.GregtechItemData; import gtPlusPlus.xmod.gregtech.api.objects.GregtechMaterialStack; -import java.util.*; -import net.minecraft.enchantment.Enchantment; -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.Fluid; -import net.minecraftforge.fluids.FluidStack; public enum GregtechOrePrefixes { - /* Electric Components. - * - * usual Materials for this are: - * Primitive (Tier 1) - * Basic (Tier 2) as used by UE as well : IC2 Circuit and RE-Battery - * Good (Tier 3) - * Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery and Lithium Battery - * Data (Tier 5) : Data Storage Circuit - * Elite (Tier 6) as used by UE as well : Energy Crystal and Data Control Circuit - * Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal - * Ultimate (Tier 8) : Data Orb and Lapotronic Energy Orb - * Infinite (Cheaty) + + /* + * Electric Components. usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used by UE as well : IC2 + * Circuit and RE-Battery Good (Tier 3) Advanced (Tier 4) as used by UE as well : Advanced Circuit, Advanced Battery + * and Lithium Battery Data (Tier 5) : Data Storage Circuit Elite (Tier 6) as used by UE as well : Energy Crystal + * and Data Control Circuit Master (Tier 7) : Energy Flow Circuit and Lapotron Crystal Ultimate (Tier 8) : Data Orb + * and Lapotronic Energy Orb Infinite (Cheaty) */ - ingotHot( - "Hot Ingots", - "Hot ", - " Ingot", - true, - true, - false, - false, - false, - false, - false, - true, - false, - false, - B[1], - M * 1, - 16, - 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer. - ingot( - "Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, + ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], + M * 1, 16, 12), // A hot Ingot, which has to be cooled down by a Vacuum Freezer. + ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, 11), // A regular Ingot. Introduced by Eloraam - dustTiny( - "Tiny Dusts", - "Tiny Pile of ", - " Dust", - true, - true, - false, - false, - false, - false, - false, - true, - false, - false, - B[0] | B[1] | B[2] | B[3], - M / 9, - 64, - 0), // 1/9th of a Dust. - dustSmall( - "Small Dusts", - "Small Pile of ", - " Dust", - true, - true, - false, - false, - false, - false, - false, - true, - false, - false, - B[0] | B[1] | B[2] | B[3], - M / 4, - 64, - 1), // 1/4th of a Dust. - dustImpure( - "Impure Dusts", - "Impure Pile of ", - " Dust", - true, - true, - false, - false, - false, - false, - false, - true, - false, - true, - B[3], - M * 1, - 64, - 3), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary Material - dustRefined( - "Refined Dusts", - "Refined Pile of ", - " Dust", - true, - true, - false, - false, - false, - false, - false, - true, - false, - true, - B[3], - M * 1, - 64, - 2), - dustPure( - "Purified Dusts", - "Purified Pile of ", - " Dust", - true, - true, - false, - false, - false, - false, - false, - true, - false, - true, - B[3], - M * 1, - 64, - 4), - dust( - "Dusts", - "", - " Dust", - true, - true, - false, - false, - false, - false, - false, - true, - false, - false, - B[0] | B[1] | B[2] | B[3], - M * 1, - 64, - 2), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka. - nugget( - "Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9, - 64, 9), // A Nugget. Introduced by Eloraam - plate( - "Plates", - "", - " Plate", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[1] | B[2], - M * 1, - 64, - 17), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia - block( - "Storage Blocks", - "Block of ", - "", - true, - true, - false, - false, - false, - true, - true, - false, - false, - false, - 0, - M * 9, - 64, - 71), // Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar - gem( - "Gemstones", - "", - "", - true, - true, - true, - false, - false, - false, - true, - true, - false, - false, - B[2], - M * 1, - 64, - 8), // A regular Gem worth one Dust. Introduced by Eloraam - gemChipped( - "Chipped Gemstones", - "Chipped ", - "", - true, - true, - true, - false, - false, - false, - true, - true, - false, - false, - B[2], - M / 4, - 64, - 59), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft - gemFlawed( - "Flawed Gemstones", - "Flawed ", - "", - true, - true, - true, - false, - false, - false, - true, - true, - false, - false, - B[2], - M / 2, - 64, - 60), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft - gemFlawless( - "Flawless Gemstones", - "Flawless ", - "", - true, - true, - true, - false, - false, - false, - true, - true, - false, - false, - B[2], - M * 2, - 32, - 61), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft - gemExquisite( - "Exquisite Gemstones", - "Exquisite ", - "", - true, - true, - true, - false, - false, - false, - true, - true, - false, - false, - B[2], - M * 4, - 16, - 62), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft - stick( - "Sticks/Rods", - "", - " Rod", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[1] | B[2], - M / 2, - 64, - 23), // Stick made of half an Ingot. Introduced by Eloraam - type2( - "16x Wires", - "16x ", - " Wire", - true, - true, - false, - false, - false, - false, - true, - false, - false, - false, - 0, - M * 8, - 64, + dustTiny("Tiny Dusts", "Tiny Pile of ", " Dust", true, true, false, false, false, false, false, true, false, false, + B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), // 1/9th of a Dust. + dustSmall("Small Dusts", "Small Pile of ", " Dust", true, true, false, false, false, false, false, true, false, + false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), // 1/4th of a Dust. + dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false, + true, B[3], M * 1, 64, 3), // Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary + // Material + dustRefined("Refined Dusts", "Refined Pile of ", " Dust", true, true, false, false, false, false, false, true, + false, true, B[3], M * 1, 64, 2), + dustPure("Purified Dusts", "Purified Pile of ", " Dust", true, true, false, false, false, false, false, true, false, + true, B[3], M * 1, 64, 4), + dust("Dusts", "", " Dust", true, true, false, false, false, false, false, true, false, false, + B[0] | B[1] | B[2] | B[3], M * 1, 64, 2), // Pure Dust worth of one Ingot or Gem. Introduced by Alblaka. + nugget("Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9, 64, + 9), // A Nugget. Introduced by Eloraam + plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M * 1, + 64, 17), // Regular Plate made of one Ingot/Dust. Introduced by Calclavia + block("Storage Blocks", "Block of ", "", true, true, false, false, false, true, true, false, false, false, 0, M * 9, + 64, 71), // Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar + gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 1, 64, 8), // A + // regular + // Gem + // worth + // one + // Dust. + // Introduced + // by + // Eloraam + gemChipped("Chipped Gemstones", "Chipped ", "", true, true, true, false, false, false, true, true, false, false, + B[2], M / 4, 64, 59), // A regular Gem worth one small Dust. Introduced by TerraFirmaCraft + gemFlawed("Flawed Gemstones", "Flawed ", "", true, true, true, false, false, false, true, true, false, false, B[2], + M / 2, 64, 60), // A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft + gemFlawless("Flawless Gemstones", "Flawless ", "", true, true, true, false, false, false, true, true, false, false, + B[2], M * 2, 32, 61), // A regular Gem worth two Dusts. Introduced by TerraFirmaCraft + gemExquisite("Exquisite Gemstones", "Exquisite ", "", true, true, true, false, false, false, true, true, false, + false, B[2], M * 4, 16, 62), // A regular Gem worth four Dusts. Introduced by TerraFirmaCraft + stick("Sticks/Rods", "", " Rod", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], + M / 2, 64, 23), // Stick made of half an Ingot. Introduced by Eloraam + type2("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 8, 64, -1), - toolSkookumChoocher( - "Skookum Choocher", - "", - " Skookum Choocher", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[6], - M * 6, - 16, - 37), // consisting out of 6 Ingots. - toolAngleGrinder( - "Angle Grinder", - "", - "Angle Grinder", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[6], - M * 6, - 16, - 37), // consisting out of 6 Ingots. - toolElectricSnips( - "Electric Snips", - "", - "Electric Snips", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[6], - M * 6, - 16, - 37), // consisting out of 6 Ingots. - toolElectricLighter( - "Electric Lighter", - "", - "Electric Lighter", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[6], - M * 6, - 16, - 37), // consisting out of 6 Ingots. - toolElectricButcherKnife( - "Electric Butcher Knife", - "", - "Electric Butcher Knife", - true, - true, - false, - false, - false, - false, - true, - true, - false, - false, - B[6], - M * 6, - 16, - 37), // consisting out of 6 Ingots. - - batterySingleuse( - "Single Use Batteries", - "", - "", - false, - true, - false, - false, - false, - false, - false, - false, - false, - false, - 0, - -1, - 64, - -1), - battery( - "Reusable Batteries", - "", - "", - false, - true, - false, - false, - false, - false, - false, - false, - false, - false, - 0, - -1, - 64, - -1), // Introduced by Calclavia - circuit( - "Circuits", - "", - "", - true, - true, - false, - false, - false, - false, - false, - false, - false, - false, - 0, - -1, - 64, - -1), // Introduced by Calclavia - chipset( - "Chipsets", - "", - "", - true, - true, - false, - false, - false, - false, - false, - false, - false, - false, - 0, - -1, - 64, - -1), // Introduced by Buildcraft - computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1), - ; // A whole Computer. "computerMaster" = ComputerCube + toolSkookumChoocher("Skookum Choocher", "", " Skookum Choocher", true, true, false, false, false, false, true, true, + false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots. + toolAngleGrinder("Angle Grinder", "", "Angle Grinder", true, true, false, false, false, false, true, true, false, + false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots. + toolElectricSnips("Electric Snips", "", "Electric Snips", true, true, false, false, false, false, true, true, false, + false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots. + toolElectricLighter("Electric Lighter", "", "Electric Lighter", true, true, false, false, false, false, true, true, + false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots. + toolElectricButcherKnife("Electric Butcher Knife", "", "Electric Butcher Knife", true, true, false, false, false, + false, true, true, false, false, B[6], M * 6, 16, 37), // consisting out of 6 Ingots. + + batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false, + false, 0, -1, 64, -1), + battery("Reusable Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, + 64, -1), // Introduced by Calclavia + circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced + // by + // Calclavia + chipset("Chipsets", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), // Introduced + // by + // Buildcraft + computer("Computers", "", "", true, true, false, false, true, false, false, false, false, false, 0, -1, 64, -1),; // A + // whole + // Computer. + // "computerMaster" + // = + // ComputerCube public static volatile int VERSION = 508; @@ -503,28 +112,17 @@ public enum GregtechOrePrefixes { public final ArrayList<ItemStack> mPrefixedItems = new ArrayList<>(); public final short mTextureIndex; public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost; - public final boolean mIsUsedForOreProcessing, - mIsEnchantable, - mIsUnificatable, - mIsMaterialBased, - mIsSelfReferencing, - mIsContainer, - mDontUnificateActively, - mIsUsedForBlocks, - mAllowNormalRecycling, - mGenerateDefaultItem; + public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing, + mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem; public final List<TC_AspectStack> mAspects = new ArrayList<>(); public final Collection<GregtechOrePrefixes> mFamiliarPrefixes = new HashSet<>(); /** - * Used to determine the amount of Material this Prefix contains. - * Multiply or Divide GregTech_API.MATERIAL_UNIT to get the Amounts in comparision to one Ingot. - * 0 = Null - * Negative = Undefined Amount + * Used to determine the amount of Material this Prefix contains. Multiply or Divide GregTech_API.MATERIAL_UNIT to + * get the Amounts in comparision to one Ingot. 0 = Null Negative = Undefined Amount */ public final long mMaterialAmount; - private final Collection<Materials> mNotGeneratedItems = new HashSet<>(), - mIgnoredMaterials = new HashSet<>(), + private final Collection<Materials> mNotGeneratedItems = new HashSet<>(), mIgnoredMaterials = new HashSet<>(), mGeneratedItems = new HashSet<>(); private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessing = new ArrayList<>(); private final ArrayList<Interface_OreRecipeRegistrator> mOreProcessingFake = new ArrayList<>(); @@ -539,24 +137,12 @@ public enum GregtechOrePrefixes { */ public int mMaterialGenerationBits = 0; - private GregtechOrePrefixes( - final String aRegularLocalName, - final String aLocalizedMaterialPre, - final String aLocalizedMaterialPost, - final boolean aIsUnificatable, - final boolean aIsMaterialBased, - final boolean aIsSelfReferencing, - final boolean aIsContainer, - final boolean aDontUnificateActively, - final boolean aIsUsedForBlocks, - final boolean aAllowNormalRecycling, - final boolean aGenerateDefaultItem, - final boolean aIsEnchantable, - final boolean aIsUsedForOreProcessing, - final int aMaterialGenerationBits, - final long aMaterialAmount, - final int aDefaultStackSize, - final int aTextureindex) { + private GregtechOrePrefixes(final String aRegularLocalName, final String aLocalizedMaterialPre, + final String aLocalizedMaterialPost, final boolean aIsUnificatable, final boolean aIsMaterialBased, + final boolean aIsSelfReferencing, final boolean aIsContainer, final boolean aDontUnificateActively, + final boolean aIsUsedForBlocks, final boolean aAllowNormalRecycling, final boolean aGenerateDefaultItem, + final boolean aIsEnchantable, final boolean aIsUsedForOreProcessing, final int aMaterialGenerationBits, + final long aMaterialAmount, final int aDefaultStackSize, final int aTextureindex) { this.mIsUnificatable = aIsUnificatable; this.mIsMaterialBased = aIsMaterialBased; this.mIsSelfReferencing = aIsSelfReferencing; @@ -599,19 +185,18 @@ public enum GregtechOrePrefixes { getTcAspectStack(TC_Aspects.FABRICO.name(), 1).addToAspectList(this.mAspects); } else if (this.name().startsWith("tool")) { getTcAspectStack(TC_Aspects.INSTRUMENTUM.name(), 2).addToAspectList(this.mAspects); - } else if (this.name().startsWith("gem") - || this.name().startsWith("crystal") - || this.name().startsWith("lens")) { - getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects); - } else if (this.name().startsWith("crate")) { - getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(this.mAspects); - } else if (this.name().startsWith("circuit")) { - getTcAspectStack("COGNITIO", 1); - } else if (this.name().startsWith("computer")) { - getTcAspectStack("COGNITIO", 4).addToAspectList(this.mAspects); - } else if (this.name().startsWith("battery")) { - getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); - } + } else + if (this.name().startsWith("gem") || this.name().startsWith("crystal") || this.name().startsWith("lens")) { + getTcAspectStack(TC_Aspects.VITREUS.name(), 1).addToAspectList(this.mAspects); + } else if (this.name().startsWith("crate")) { + getTcAspectStack(TC_Aspects.ITER.name(), 2).addToAspectList(this.mAspects); + } else if (this.name().startsWith("circuit")) { + getTcAspectStack("COGNITIO", 1); + } else if (this.name().startsWith("computer")) { + getTcAspectStack("COGNITIO", 4).addToAspectList(this.mAspects); + } else if (this.name().startsWith("battery")) { + getTcAspectStack(TC_Aspects.ELECTRUM.name(), 1).addToAspectList(this.mAspects); + } } public static GregtechOrePrefixes getOrePrefix(final String aOre) { @@ -695,8 +280,7 @@ public enum GregtechOrePrefixes { } public boolean doGenerateItem(final Materials aMaterial) { - return (aMaterial != null) - && (aMaterial != Materials._NULL) + return (aMaterial != null) && (aMaterial != Materials._NULL) && (((aMaterial.mTypes & this.mMaterialGenerationBits) != 0) || this.mGeneratedItems.contains(aMaterial)) && !this.mNotGeneratedItems.contains(aMaterial) @@ -726,16 +310,21 @@ public enum GregtechOrePrefixes { return this.mOreProcessing.add(aRegistrator); } - public void processOre( - final GT_Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { + public void processOre(final GT_Materials aMaterial, final String aOreDictName, final String aModName, + final ItemStack aStack) { if ((aMaterial != null) && ((aMaterial != GT_Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased) && GT_Utility.isStackValid(aStack)) { for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessing) { if (D2) { GT_Log.ore.println( - "Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '" - + aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator)); + "Processing '" + aOreDictName + + "' with the Prefix '" + + this.name() + + "' and the Material '" + + aMaterial.name() + + "' at " + + GT_Utility.getClassName(tRegistrator)); } tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack)); } @@ -743,16 +332,20 @@ public enum GregtechOrePrefixes { } // TODO - public void processOre( - final Materials aMaterial, final String aOreDictName, final String aModName, final ItemStack aStack) { - if ((aMaterial != null) - && ((aMaterial != Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased) + public void processOre(final Materials aMaterial, final String aOreDictName, final String aModName, + final ItemStack aStack) { + if ((aMaterial != null) && ((aMaterial != Materials._NULL) || this.mIsSelfReferencing || !this.mIsMaterialBased) && GT_Utility.isStackValid(aStack)) { for (final Interface_OreRecipeRegistrator tRegistrator : this.mOreProcessingFake) { if (D2) { GT_Log.ore.println( - "Processing '" + aOreDictName + "' with the Prefix '" + this.name() + "' and the Material '" - + aMaterial.name() + "' at " + GT_Utility.getClassName(tRegistrator)); + "Processing '" + aOreDictName + + "' with the Prefix '" + + this.name() + + "' and the Material '" + + aMaterial.name() + + "' at " + + GT_Utility.getClassName(tRegistrator)); } tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack)); } @@ -775,727 +368,166 @@ public enum GregtechOrePrefixes { public enum GT_Materials implements IColorModulationContainer, ISubTagContainer { /** - * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted at a location where it shouldn't happen. + * This is the Default Material returned in case no Material has been found or a NullPointer has been inserted + * at a location where it shouldn't happen. * <p/> * Mainly for preventing NullPointer Exceptions and providing Default Values. * * Unknown Material Components. Dead End Section. * - * Alkalus Range 730-799 & 970-998 - * (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality, aTypes, R, G, B, Alpha, aLocalName, - * aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor - * this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true); + * Alkalus Range 730-799 & 970-998 (aMetaItemSubID, TextureSet, aToolSpeed, aToolDurability, aToolQuality, + * aTypes, R, G, B, Alpha, aLocalName, aFuelType, aFuelPower, aMeltingPoint, aBlastFurnaceTemp, + * aBlastFurnaceRequired, aTransparent, aOreValue, aDensityMultiplier, aDensityDivider, aColor + * this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true); * */ - _NULL( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "NULL", - 0, - 0, - 0, - 0, - false, - false, - 1, - 1, - 1, - Dyes._NULL, - Element._NULL, - Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))), + _NULL(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "NULL", 0, 0, 0, 0, false, false, 1, 1, 1, + Dyes._NULL, Element._NULL, Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS.name(), 1))), // Lapis(526, TextureSet.SET_LAPIS, 1.0F, 0, 1, 1 | 4 | 8, 70, 70, 220, 0, "Lapis", 0, 0, -1, 0, false, false, // 3, 1, 1, Dyes.dyeBlue, 2, Arrays.asList(new MaterialStack(Materials.Lazurite, 12), new // MaterialStack(Materials.Sodalite, 2), new MaterialStack(Materials.Pyrite, 1), new // MaterialStack(Materials.Calcite, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.SENSUS, 1))), - Pyrotheum( - 20, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 255, - 128, - 0, - 0, - "Pyrotheum", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeYellow, - 2, + Pyrotheum(20, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 255, 128, 0, 0, "Pyrotheum", 0, 0, -1, 0, false, + false, 2, 3, 1, Dyes.dyeYellow, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1)), Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.IGNIS, 1))), - Cryotheum( - 21, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 102, - 178, - 255, - 0, - "Cryotheum", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeLightBlue, - 2, + Cryotheum(21, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 102, 178, 255, 0, "Cryotheum", 0, 0, -1, 0, false, + false, 2, 3, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Blizz, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Snow, 1), new MaterialStack(Materials.Niter, 1)), Arrays.asList(getTcAspectStack("PRAECANTATIO", 2), getTcAspectStack(TC_Aspects.GELUM, 1))), - Ender( - 22, - TextureSet.SET_FLUID, - 1.0F, - 0, - 2, - 1, - 255, - 255, - 255, - 0, - "Ender", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, + Ender(22, TextureSet.SET_FLUID, 1.0F, 0, 2, 1, 255, 255, 255, 0, "Ender", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen), /** * Circuitry, Batteries and other Technical things */ - Symbiotic( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "IV Tier", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeLightGray, + Symbiotic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "IV Tier", 0, 0, -1, 0, false, false, 1, 1, + 1, Dyes.dyeLightGray, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 4), getTcAspectStack(TC_Aspects.MACHINA, 4))), - Neutronic( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "LuV Tier", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeLightGray, + Neutronic(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "LuV Tier", 0, 0, -1, 0, false, false, 1, 1, + 1, Dyes.dyeLightGray, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 6), getTcAspectStack(TC_Aspects.MACHINA, 6))), - Quantum( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "ZPM Tier", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeLightGray, + Quantum(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 255, 255, 255, 0, "ZPM Tier", 0, 0, -1, 0, false, false, 1, 1, + 1, Dyes.dyeLightGray, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8), getTcAspectStack(TC_Aspects.MACHINA, 8))), - Superconductor( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 190, - 240, - 190, - 0, - "Superconductor", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeGreen, - Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))), - - Staballoy( - 30, - TextureSet.SET_ROUGH, - 10.0F, - 5120, - 4, - 1 | 2 | 16 | 32 | 64 | 128, - 68, - 75, - 66, - 0, - "Staballoy", - 0, - 0, - 1500, - 2800, - true, - false, - 1, - 3, - 1, - Dyes.dyeGreen, - 2, + Superconductor(-1, TextureSet.SET_NONE, 1.0F, 0, 0, 0, 190, 240, 190, 0, "Superconductor", 0, 0, -1, 0, false, + false, 1, 1, 1, Dyes.dyeGreen, Arrays.asList(getTcAspectStack(TC_Aspects.ELECTRUM, 8))), + + Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0, + 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - Bedrockium( - 31, - TextureSet.SET_FINE, - 8.0F, - 8196, - 3, - 1 | 2 | 16 | 32 | 64 | 128, - 39, - 39, - 39, - 0, - "Bedrockium", - 0, - 0, - -1, - 0, - false, - false, - 1, - 5, - 1, - Dyes.dyeLightGray, - 2, + Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, + 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)), Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))), - BloodSteel( - 32, - TextureSet.SET_METALLIC, - 11.0F, - 768, - 4, - 1 | 2 | 16 | 32 | 64 | 128, - 142, - 28, - 0, - 0, - "Blood Steel", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeRed, - 2, + BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", + 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))), - Void( - 33, - TextureSet.SET_METALLIC, - 6.0F, - 1280, - 3, - 1 | 2 | 16 | 32 | 64 | 128, - 82, - 17, - 82, - 0, - "Void Metal", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeBlack, + Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, + -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))), - ConductiveIron( - 34, - TextureSet.SET_METALLIC, - 5.0F, - 256, - 2, - 1 | 2, - 164, - 109, - 100, - 0, - "Conductive Iron", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeRed, - 2, + ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, + 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))), - ElectricalSteel( - 35, - TextureSet.SET_METALLIC, - 7.0F, - 768, - 3, - 1 | 2 | 64 | 128, - 194, - 194, - 194, - 0, - "Electrical Steel", - 0, - 0, - 1811, - 1000, - true, - false, - 3, - 1, - 1, - Dyes.dyeLightGray, - 2, + ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, + "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList( new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))), - EnergeticAlloy( - 36, - TextureSet.SET_SHINY, - 5.0F, - 512, - 3, - 1 | 2 | 64 | 128, - 252, - 152, - 45, - 0, - "Energetic Alloy", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeOrange, - 2, + EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, + 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList( new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))), - VibrantAlloy( - 37, - TextureSet.SET_SHINY, - 7.0F, - 1280, - 4, - 1 | 2 | 64 | 128, - 204, - 242, - 142, - 0, - "Vibrant Alloy", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeLime, - 2, + VibrantAlloy(37, TextureSet.SET_SHINY, 7.0F, 1280, 4, 1 | 2 | 64 | 128, 204, 242, 142, 0, "Vibrant Alloy", 0, 0, + -1, 0, false, false, 3, 1, 1, Dyes.dyeLime, 2, Arrays.asList( - new MaterialStack(Materials.EnergeticAlloy, 1), new MaterialStack(Materials.EnderPearl, 3)), + new MaterialStack(Materials.EnergeticAlloy, 1), + new MaterialStack(Materials.EnderPearl, 3)), Arrays.asList(getTcAspectStack(TC_Aspects.MACHINA, 5), getTcAspectStack(TC_Aspects.TELUM, 4))), - PulsatingIron( - 38, - TextureSet.SET_SHINY, - 5.0F, - 256, - 2, - 1 | 2 | 64 | 128, - 50, - 91, - 21, - 0, - "Pulsating Iron", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeGreen, - 2, + PulsatingIron(38, TextureSet.SET_SHINY, 5.0F, 256, 2, 1 | 2 | 64 | 128, 50, 91, 21, 0, "Pulsating Iron", 0, 0, + -1, 0, false, false, 3, 1, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.EnderPearl, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.ALIENIS, 3), getTcAspectStack(TC_Aspects.METALLUM, 3))), - /* TODO*/ RedstoneAlloy( - 39, - TextureSet.SET_METALLIC, - 1.0F, - 256, - 2, - 1 | 2 | 16 | 32 | 64, - 178, - 34, - 34, - 0, - "Redstone Alloy", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeRed, - 2, + /* TODO */ RedstoneAlloy(39, TextureSet.SET_METALLIC, 1.0F, 256, 2, 1 | 2 | 16 | 32 | 64, 178, 34, 34, 0, + "Redstone Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 2), new MaterialStack(Materials.Redstone, 4))), // Needs more Use, I think. - Tantalloy60( - 40, - TextureSet.SET_DULL, - 8.0F, - 5120, - 3, - 1 | 2 | 16 | 32 | 64 | 128, - 68, - 75, - 166, - 0, - "Tantalloy-60", - 0, - 0, - 3035, - 2200, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + Tantalloy60(40, TextureSet.SET_DULL, 8.0F, 5120, 3, 1 | 2 | 16 | 32 | 64 | 128, 68, 75, 166, 0, "Tantalloy-60", + 0, 0, 3035, 2200, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList(new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - Tantalloy61( - 41, - TextureSet.SET_DULL, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 122, - 135, - 196, - 0, - "Tantalloy-61", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + Tantalloy61(41, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 122, 135, 196, 0, + "Tantalloy-61", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - Potin( - 42, - TextureSet.SET_METALLIC, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 201, - 151, - 129, - 0, - "Potin", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + Potin(42, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 201, 151, 129, 0, "Potin", 0, 0, + 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - Inconel792( - 43, - TextureSet.SET_METALLIC, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 108, - 240, - 118, - 0, - "Inconel-792", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + Inconel792(43, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 108, 240, 118, 0, + "Inconel-792", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - Inconel690( - 44, - TextureSet.SET_DULL, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 118, - 220, - 138, - 0, - "Inconel-690", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + Inconel690(44, TextureSet.SET_DULL, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 118, 220, 138, 0, "Inconel-690", + 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - MaragingSteel300( - 45, - TextureSet.SET_METALLIC, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 150, - 150, - 150, - 0, - "Maraging Steel 300", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + MaragingSteel300(45, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 150, 150, 150, 0, + "Maraging Steel 300", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - MaragingSteel350( - 46, - TextureSet.SET_METALLIC, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 160, - 160, - 160, - 0, - "Maraging Steel 350", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + MaragingSteel350(46, TextureSet.SET_METALLIC, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 160, 160, 160, 0, + "Maraging Steel 350", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - HastelloyX( - 47, - TextureSet.SET_SHINY, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 255, - 193, - 37, - 0, - "Hastelloy-X", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + HastelloyX(47, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 193, 37, 0, "Hastelloy-X", + 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), new MaterialStack(Materials.Titanium, 1)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), - TriniumNaquadahCarbonite( - 48, - TextureSet.SET_SHINY, - 7.0F, - 5120, - 2, - 1 | 2 | 16 | 32 | 64 | 128, - 255, - 233, - 0, - 0, - "Trinium Naquadah Carbonite", - 0, - 0, - 3015, - 2150, - true, - false, - 1, - 2, - 1, - Dyes.dyeLightBlue, - 2, + TriniumNaquadahCarbonite(48, TextureSet.SET_SHINY, 7.0F, 5120, 2, 1 | 2 | 16 | 32 | 64 | 128, 255, 233, 0, 0, + "Trinium Naquadah Carbonite", 0, 0, 3015, 2150, true, false, 1, 2, 1, Dyes.dyeLightBlue, 2, Arrays.asList( new MaterialStack(Materials.Tungsten, 1), new MaterialStack(Materials.Tantalum, 9), @@ -1503,289 +535,78 @@ public enum GregtechOrePrefixes { Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))), // Radioactive Materials - HydrofluoricAcid( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 200, - 200, - 200, - 0, - "Hydrofluoric Acid", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + HydrofluoricAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 200, 200, 200, 0, "Hydrofluoric Acid", 0, 0, + -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - UraniumHexaFluoride( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 73, - 220, - 83, - 0, - "Uranium Hexafluoride", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeLime, - 2, + UraniumHexaFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Hexafluoride", + 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - UraniumTetraFluoride( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 73, - 220, - 83, - 0, - "Uranium Tetrafluoride", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeLime, - 2, + UraniumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 73, 220, 83, 0, "Uranium Tetrafluoride", + 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeLime, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - ThoriumTetraFluoride( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 15, - 120, - 15, - 0, - "Thorium Tetrafluoride", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeGreen, - 2, + ThoriumTetraFluoride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 15, 120, 15, 0, "Thorium Tetrafluoride", + 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeGreen, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - SulfurousAcid( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 110, - 220, - 30, - 0, - "Sulfurous Acid", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + SulfurousAcid(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 110, 220, 30, 0, "Sulfurous Acid", 0, 0, -1, 0, + false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - SulfurDioxide( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 150, - 200, - 50, - 0, - "Sulfur Dioxide", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + SulfurDioxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 200, 50, 0, "Sulfur Dioxide", 0, 0, -1, 0, + false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - HydrogenChloride( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 150, - 240, - 90, - 0, - "Hydrogen Chloride", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + HydrogenChloride(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 150, 240, 90, 0, "Hydrogen Chloride", 0, 0, + -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - SulfuricApatite( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 0, - 105, - 105, - 0, - "Sulfuric Apatite Solution", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + SulfuricApatite(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Apatite Solution", + 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - SulfuricLithium( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 0, - 105, - 105, - 0, - "Sulfuric Lithium Solution", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + SulfuricLithium(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Sulfuric Lithium Solution", + 0, 0, -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), new MaterialStack(Materials.Sulfur, 1))), - LithiumHydroxide( - -1, - TextureSet.SET_FLUID, - 1.0F, - 0, - 1, - 2 | 16 | 32, - 0, - 105, - 105, - 0, - "Lithium Hydroxide", - 0, - 0, - -1, - 0, - false, - false, - 2, - 3, - 1, - Dyes.dyeWhite, - 2, + LithiumHydroxide(-1, TextureSet.SET_FLUID, 1.0F, 0, 1, 2 | 16 | 32, 0, 105, 105, 0, "Lithium Hydroxide", 0, 0, + -1, 0, false, false, 2, 3, 1, Dyes.dyeWhite, 2, Arrays.asList( new MaterialStack(Materials.Coal, 1), new MaterialStack(Materials.Redstone, 1), new MaterialStack(Materials.Blaze, 1), - new MaterialStack(Materials.Sulfur, 1))), - ; + new MaterialStack(Materials.Sulfur, 1))),; /** * List of all Materials. @@ -1793,25 +614,24 @@ public enum GregtechOrePrefixes { public static final Collection<GT_Materials> VALUES = new HashSet<>(Arrays.asList(values())); static { - /*Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Advanced.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Data.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Elite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Master.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Ultimate.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Superconductor.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); - Infinite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING);*/ + /* + * Primitive.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Basic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); + * Good.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Advanced.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); + * Data.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Elite.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); + * Master.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Ultimate.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); + * Superconductor.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Infinite.add(SubTag.NO_SMASHING, + * SubTag.NO_SMELTING); + */ Symbiotic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Neutronic.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); Quantum.add(SubTag.NO_SMASHING, SubTag.NO_SMELTING); } /** - * This Array can be changed dynamically by a Tick Handler in order to get a glowing Effect on all GT Meta Items out of this Material. + * This Array can be changed dynamically by a Tick Handler in order to get a glowing Effect on all GT Meta Items + * out of this Material. */ - public final short[] mRGBa = new short[] {255, 255, 255, 0}, mMoltenRGBa = new short[] {255, 255, 255, 0}; + public final short[] mRGBa = new short[] { 255, 255, 255, 0 }, mMoltenRGBa = new short[] { 255, 255, 255, 0 }; public final TextureSet mIconSet; public final int mMetaItemSubID; @@ -1829,37 +649,22 @@ public enum GregtechOrePrefixes { public String mChemicalFormula = "?", mDefaultLocalName = "null"; public Dyes mColor = Dyes._NULL; public short mMeltingPoint = 0, mBlastFurnaceTemp = 0; - public int mTypes = 0, - mDurability = 16, - mFuelPower = 0, - mFuelType = 0, - mExtraData = 0, - mOreValue = 0, - mOreMultiplier = 1, - mByProductMultiplier = 1, - mSmeltingMultiplier = 1; + public int mTypes = 0, mDurability = 16, mFuelPower = 0, mFuelType = 0, mExtraData = 0, mOreValue = 0, + mOreMultiplier = 1, mByProductMultiplier = 1, mSmeltingMultiplier = 1; public long mDensity = M; public Element mElement = null; - public GT_Materials mDirectSmelting = this, - mOreReplacement = this, - mMacerateInto = this, - mSmeltInto = this, - mArcSmeltInto = this, - mHandleMaterial = this; + public GT_Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this, + mArcSmeltInto = this, mHandleMaterial = this; public byte mToolQuality = 0; public Fluid mSolid = null, mFluid = null, mGas = null, mPlasma = null; /** - * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one Material Unit worth + * This Fluid is used as standard Unit for Molten Materials. 1296 is a Molten Block, what means 144 is one + * Material Unit worth */ public Fluid mStandardMoltenFluid = null; - private GT_Materials( - final int aMetaItemSubID, - final TextureSet aIconSet, - final float aToolSpeed, - final int aToolDurability, - final int aToolQuality, - final boolean aUnificatable) { + private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, + final int aToolDurability, final int aToolQuality, final boolean aUnificatable) { this.mUnificatable = aUnificatable; this.mMaterialInto = this; this.mMetaItemSubID = aMetaItemSubID; @@ -1890,20 +695,17 @@ public enum GregtechOrePrefixes { /** * @param aMetaItemSubID the Sub-ID used in my own MetaItems. Range 0-1000. -1 for no Material - * @param aTypes which kind of Items should be generated. Bitmask as follows: - * 1 = Dusts of all kinds. - * 2 = Dusts, Ingots, Plates, Rods/Sticks, Machine Components and other Metal specific things. - * 4 = Dusts, Gems, Plates, Lenses (if transparent). - * 8 = Dusts, Impure Dusts, crushed Ores, purified Ores, centrifuged Ores etc. - * 16 = Cells - * 32 = Plasma Cells - * 64 = Tool Heads - * 128 = Gears + * @param aTypes which kind of Items should be generated. Bitmask as follows: 1 = Dusts of all + * kinds. 2 = Dusts, Ingots, Plates, Rods/Sticks, Machine Components and other + * Metal specific things. 4 = Dusts, Gems, Plates, Lenses (if transparent). 8 = + * Dusts, Impure Dusts, crushed Ores, purified Ores, centrifuged Ores etc. 16 = + * Cells 32 = Plasma Cells 64 = Tool Heads 128 = Gears * @param aR, aG, aB Color of the Material 0-255 each. * @param aA transparency of the Material Texture. 0 = fully visible, 255 = Invisible. * @param aLocalName The Name used as Default for localization. * @param aFuelType Type of Generator to get Energy from this Material. - * @param aFuelPower EU generated. Will be multiplied by 1000, also additionally multiplied by 2 for Gems. + * @param aFuelPower EU generated. Will be multiplied by 1000, also additionally multiplied by 2 for + * Gems. * @param aAmplificationValue Amount of UUM amplifier gotten from this. * @param aUUMEnergy Amount of EU needed to shape the UUM into this Material. * @param aMeltingPoint Used to determine the smelting Costs in Furnii. @@ -1911,28 +713,12 @@ public enum GregtechOrePrefixes { * @param aBlastFurnaceRequired If this requires a Blast Furnace. * @param aColor Vanilla MC Wool Color which comes the closest to this. */ - private GT_Materials( - final int aMetaItemSubID, - final TextureSet aIconSet, - final float aToolSpeed, - final int aToolDurability, - final int aToolQuality, - final int aTypes, - final int aR, - final int aG, - final int aB, - final int aA, - final String aLocalName, - final int aFuelType, - final int aFuelPower, - final int aMeltingPoint, - final int aBlastFurnaceTemp, - final boolean aBlastFurnaceRequired, - final boolean aTransparent, - final int aOreValue, - final int aDensityMultiplier, - final int aDensityDivider, - final Dyes aColor) { + private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, + final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG, + final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower, + final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired, + final boolean aTransparent, final int aOreValue, final int aDensityMultiplier, + final int aDensityDivider, final Dyes aColor) { this(aMetaItemSubID, aIconSet, aToolSpeed, aToolDurability, aToolQuality, true); this.mDefaultLocalName = aLocalName; this.mMeltingPoint = (short) aMeltingPoint; @@ -1959,29 +745,12 @@ public enum GregtechOrePrefixes { } } - private GT_Materials( - final int aMetaItemSubID, - final TextureSet aIconSet, - final float aToolSpeed, - final int aToolDurability, - final int aToolQuality, - final int aTypes, - final int aR, - final int aG, - final int aB, - final int aA, - final String aLocalName, - final int aFuelType, - final int aFuelPower, - final int aMeltingPoint, - final int aBlastFurnaceTemp, - final boolean aBlastFurnaceRequired, - final boolean aTransparent, - final int aOreValue, - final int aDensityMultiplier, - final int aDensityDivider, - final Dyes aColor, - final List<TC_AspectStack> aAspects) { + private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, + final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG, + final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower, + final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired, + final boolean aTransparent, final int aOreValue, final int aDensityMultiplier, + final int aDensityDivider, final Dyes aColor, final List<TC_AspectStack> aAspects) { this( aMetaItemSubID, aIconSet, @@ -2010,29 +779,12 @@ public enum GregtechOrePrefixes { /** * @param aElement The Element Enum represented by this Material */ - private GT_Materials( - final int aMetaItemSubID, - final TextureSet aIconSet, - final float aToolSpeed, - final int aToolDurability, - final int aToolQuality, - final int aTypes, - final int aR, - final int aG, - final int aB, - final int aA, - final String aLocalName, - final int aFuelType, - final int aFuelPower, - final int aMeltingPoint, - final int aBlastFurnaceTemp, - final boolean aBlastFurnaceRequired, - final boolean aTransparent, - final int aOreValue, - final int aDensityMultiplier, - final int aDensityDivider, - final Dyes aColor, - final Element aElement, + private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, + final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG, + final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower, + final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired, + final boolean aTransparent, final int aOreValue, final int aDensityMultiplier, + final int aDensityDivider, final Dyes aColor, final Element aElement, final List<TC_AspectStack> aAspects) { this( aMetaItemSubID, @@ -2067,29 +819,12 @@ public enum GregtechOrePrefixes { this.mAspects.addAll(aAspects); } - private GT_Materials( - final int aMetaItemSubID, - final TextureSet aIconSet, - final float aToolSpeed, - final int aToolDurability, - final int aToolQuality, - final int aTypes, - final int aR, - final int aG, - final int aB, - final int aA, - final String aLocalName, - final int aFuelType, - final int aFuelPower, - final int aMeltingPoint, - final int aBlastFurnaceTemp, - final boolean aBlastFurnaceRequired, - final boolean aTransparent, - final int aOreValue, - final int aDensityMultiplier, - final int aDensityDivider, - final Dyes aColor, - final int aExtraData, + private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, + final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG, + final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower, + final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired, + final boolean aTransparent, final int aOreValue, final int aDensityMultiplier, + final int aDensityDivider, final Dyes aColor, final int aExtraData, final List<MaterialStack> aMaterialList) { this( aMetaItemSubID, @@ -2118,31 +853,13 @@ public enum GregtechOrePrefixes { null); } - private GT_Materials( - final int aMetaItemSubID, - final TextureSet aIconSet, - final float aToolSpeed, - final int aToolDurability, - final int aToolQuality, - final int aTypes, - final int aR, - final int aG, - final int aB, - final int aA, - final String aLocalName, - final int aFuelType, - final int aFuelPower, - final int aMeltingPoint, - final int aBlastFurnaceTemp, - final boolean aBlastFurnaceRequired, - final boolean aTransparent, - final int aOreValue, - final int aDensityMultiplier, - final int aDensityDivider, - final Dyes aColor, - final int aExtraData, - final List<MaterialStack> aMaterialList, - final List<TC_AspectStack> aAspects) { + private GT_Materials(final int aMetaItemSubID, final TextureSet aIconSet, final float aToolSpeed, + final int aToolDurability, final int aToolQuality, final int aTypes, final int aR, final int aG, + final int aB, final int aA, final String aLocalName, final int aFuelType, final int aFuelPower, + final int aMeltingPoint, final int aBlastFurnaceTemp, final boolean aBlastFurnaceRequired, + final boolean aTransparent, final int aOreValue, final int aDensityMultiplier, + final int aDensityDivider, final Dyes aColor, final int aExtraData, + final List<MaterialStack> aMaterialList, final List<TC_AspectStack> aAspects) { this( aMetaItemSubID, aIconSet, @@ -2221,17 +938,16 @@ public enum GregtechOrePrefixes { public static void init(final GT_Config aConfiguration) { for (final GT_Materials tMaterial : VALUES) { final String tString = tMaterial.toString().toLowerCase(); - tMaterial.mHeatDamage = (float) - aConfiguration.get(ConfigCategories.Materials.heatdamage, tString, tMaterial.mHeatDamage); + tMaterial.mHeatDamage = (float) aConfiguration + .get(ConfigCategories.Materials.heatdamage, tString, tMaterial.mHeatDamage); if (tMaterial.mBlastFurnaceRequired) { - tMaterial.mBlastFurnaceRequired = - aConfiguration.get(ConfigCategories.Materials.blastfurnacerequirements, tString, true); + tMaterial.mBlastFurnaceRequired = aConfiguration + .get(ConfigCategories.Materials.blastfurnacerequirements, tString, true); } - if (tMaterial.mBlastFurnaceRequired - && aConfiguration.get( - ConfigCategories.Materials.blastinductionsmelter, - tString, - tMaterial.mBlastFurnaceTemp < 1500)) {} + if (tMaterial.mBlastFurnaceRequired && aConfiguration.get( + ConfigCategories.Materials.blastinductionsmelter, + tString, + tMaterial.mBlastFurnaceTemp < 1500)) {} // GT_ModHandler.ThermalExpansion.addSmelterBlastOre(tMaterial); // tMaterial.mHandleMaterial = (tMaterial == Desh ? tMaterial.mHandleMaterial : tMaterial == Diamond || // tMaterial == Thaumium ? Wood : tMaterial.contains(SubTag.BURNING) ? Blaze : @@ -2320,8 +1036,7 @@ public enum GregtechOrePrefixes { } if ((aMultiplier >= (M * 2)) && !this.mMaterialList.isEmpty()) { return (((this.mElement != null) - || ((this.mMaterialList.size() < 2) - && (this.mMaterialList.get(0).mAmount == 1))) + || ((this.mMaterialList.size() < 2) && (this.mMaterialList.get(0).mAmount == 1))) ? this.mChemicalFormula : "(" + this.mChemicalFormula + ")") + aMultiplier; @@ -2414,8 +1129,8 @@ public enum GregtechOrePrefixes { } /** - * Adds a Material to the List of Byproducts when grinding this Ore. - * Is used for more precise Ore grinding, so that it is possible to choose between certain kinds of Materials. + * Adds a Material to the List of Byproducts when grinding this Ore. Is used for more precise Ore grinding, so + * that it is possible to choose between certain kinds of Materials. */ public GT_Materials addOreByProduct(final GT_Materials aMaterial) { if (!this.mOreByProducts.contains(aMaterial.mMaterialInto)) { @@ -2425,8 +1140,8 @@ public enum GregtechOrePrefixes { } /** - * Adds multiple Materials to the List of Byproducts when grinding this Ore. - * Is used for more precise Ore grinding, so that it is possible to choose between certain kinds of Materials. + * Adds multiple Materials to the List of Byproducts when grinding this Ore. Is used for more precise Ore + * grinding, so that it is possible to choose between certain kinds of Materials. */ public GT_Materials addOreByProducts(final GT_Materials... aMaterials) { for (final GT_Materials tMaterial : aMaterials) { @@ -2438,8 +1153,7 @@ public enum GregtechOrePrefixes { } /** - * If this Ore gives multiple drops of its Main Material. - * Lapis Ore for example gives about 6 drops. + * If this Ore gives multiple drops of its Main Material. Lapis Ore for example gives about 6 drops. */ public GT_Materials setOreMultiplier(final int aOreMultiplier) { if (aOreMultiplier > 0) { @@ -2459,8 +1173,7 @@ public enum GregtechOrePrefixes { } /** - * If this Ore gives multiple drops of its Main Material. - * Lapis Ore for example gives about 6 drops. + * If this Ore gives multiple drops of its Main Material. Lapis Ore for example gives about 6 drops. */ public GT_Materials setSmeltingMultiplier(final int aSmeltingMultiplier) { if (aSmeltingMultiplier > 0) { @@ -2480,8 +1193,8 @@ public enum GregtechOrePrefixes { } /** - * This Material should be the Main Material this Ore gets ground into. - * Example, Chromite giving Chrome or Tungstate giving Tungsten. + * This Material should be the Main Material this Ore gets ground into. Example, Chromite giving Chrome or + * Tungstate giving Tungsten. */ public GT_Materials setOreReplacement(final GT_Materials aMaterial) { if (aMaterial != null) { diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java index 4874e84b7b..87d85a578e 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextureSet.java @@ -4,31 +4,20 @@ import gregtech.api.enums.Textures; import gregtech.api.interfaces.IIconContainer; public class GregtechTextureSet { + public static final GregtechTextureSet SET_NONE = new GregtechTextureSet("NONE"), - SET_DULL = new GregtechTextureSet("DULL"), - SET_RUBY = new GregtechTextureSet("RUBY"), - SET_OPAL = new GregtechTextureSet("OPAL"), - SET_LEAF = new GregtechTextureSet("LEAF"), - SET_WOOD = new GregtechTextureSet("WOOD"), - SET_SAND = new GregtechTextureSet("SAND"), - SET_FINE = new GregtechTextureSet("FINE"), - SET_FIERY = new GregtechTextureSet("FIERY"), - SET_FLUID = new GregtechTextureSet("FLUID"), - SET_ROUGH = new GregtechTextureSet("ROUGH"), - SET_PAPER = new GregtechTextureSet("PAPER"), - SET_GLASS = new GregtechTextureSet("GLASS"), - SET_FLINT = new GregtechTextureSet("FLINT"), - SET_LAPIS = new GregtechTextureSet("LAPIS"), - SET_SHINY = new GregtechTextureSet("SHINY"), - SET_SHARDS = new GregtechTextureSet("SHARDS"), - SET_POWDER = new GregtechTextureSet("POWDER"), - SET_QUARTZ = new GregtechTextureSet("QUARTZ"), - SET_EMERALD = new GregtechTextureSet("EMERALD"), - SET_DIAMOND = new GregtechTextureSet("DIAMOND"), - SET_LIGNITE = new GregtechTextureSet("LIGNITE"), - SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"), - SET_METALLIC = new GregtechTextureSet("METALLIC"), - SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"), + SET_DULL = new GregtechTextureSet("DULL"), SET_RUBY = new GregtechTextureSet("RUBY"), + SET_OPAL = new GregtechTextureSet("OPAL"), SET_LEAF = new GregtechTextureSet("LEAF"), + SET_WOOD = new GregtechTextureSet("WOOD"), SET_SAND = new GregtechTextureSet("SAND"), + SET_FINE = new GregtechTextureSet("FINE"), SET_FIERY = new GregtechTextureSet("FIERY"), + SET_FLUID = new GregtechTextureSet("FLUID"), SET_ROUGH = new GregtechTextureSet("ROUGH"), + SET_PAPER = new GregtechTextureSet("PAPER"), SET_GLASS = new GregtechTextureSet("GLASS"), + SET_FLINT = new GregtechTextureSet("FLINT"), SET_LAPIS = new GregtechTextureSet("LAPIS"), + SET_SHINY = new GregtechTextureSet("SHINY"), SET_SHARDS = new GregtechTextureSet("SHARDS"), + SET_POWDER = new GregtechTextureSet("POWDER"), SET_QUARTZ = new GregtechTextureSet("QUARTZ"), + SET_EMERALD = new GregtechTextureSet("EMERALD"), SET_DIAMOND = new GregtechTextureSet("DIAMOND"), + SET_LIGNITE = new GregtechTextureSet("LIGNITE"), SET_MAGNETIC = new GregtechTextureSet("MAGNETIC"), + SET_METALLIC = new GregtechTextureSet("METALLIC"), SET_NETHERSTAR = new GregtechTextureSet("NETHERSTAR"), SET_GEM_VERTICAL = new GregtechTextureSet("GEM_VERTICAL"), SET_GEM_HORIZONTAL = new GregtechTextureSet("GEM_HORIZONTAL"); @@ -38,8 +27,8 @@ public class GregtechTextureSet { public GregtechTextureSet(final String aSetName) { this.mSetName = aSetName; this.mTextures[0] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/turbineBlade"); - this.mTextures[1] = - new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/toolHeadSkookumChoocher"); + this.mTextures[1] = new Textures.ItemIcons.CustomIcon( + "materialicons/" + this.mSetName + "/toolHeadSkookumChoocher"); this.mTextures[2] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); this.mTextures[3] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); this.mTextures[4] = new Textures.ItemIcons.CustomIcon("materialicons/" + this.mSetName + "/void"); diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java index b4251bd646..dee662ac20 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java @@ -1,15 +1,18 @@ package gtPlusPlus.xmod.gregtech.api.enums; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; + import gtPlusPlus.core.lib.CORE; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture; import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy; -import net.minecraft.client.renderer.texture.TextureMap; -import net.minecraft.util.IIcon; -import net.minecraft.util.ResourceLocation; public class GregtechTextures { + public enum BlockIcons implements Interface_IconContainer, Runnable { + VOID, LARGECENTRIFUGE1, @@ -30,31 +33,14 @@ public class GregtechTextures { LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, LARGECENTRIFUGE_ACTIVE9; - public static final Interface_IconContainer[] - CENTRIFUGE = - new Interface_IconContainer[] { - LARGECENTRIFUGE1, - LARGECENTRIFUGE2, - LARGECENTRIFUGE3, - LARGECENTRIFUGE4, - LARGECENTRIFUGE5, - LARGECENTRIFUGE6, - LARGECENTRIFUGE7, - LARGECENTRIFUGE8, - LARGECENTRIFUGE9 - }, - CENTRIFUGE_ACTIVE = - new Interface_IconContainer[] { - LARGECENTRIFUGE_ACTIVE1, - LARGECENTRIFUGE_ACTIVE2, - LARGECENTRIFUGE_ACTIVE3, - LARGECENTRIFUGE_ACTIVE4, - LARGECENTRIFUGE_ACTIVE5, - LARGECENTRIFUGE_ACTIVE6, - LARGECENTRIFUGE_ACTIVE7, - LARGECENTRIFUGE_ACTIVE8, - LARGECENTRIFUGE_ACTIVE9 - }; + + public static final Interface_IconContainer[] CENTRIFUGE = new Interface_IconContainer[] { LARGECENTRIFUGE1, + LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, LARGECENTRIFUGE6, + LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9 }, + CENTRIFUGE_ACTIVE = new Interface_IconContainer[] { LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, + LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, LARGECENTRIFUGE_ACTIVE5, + LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, + LARGECENTRIFUGE_ACTIVE9 }; public static Interface_Texture[] GT_CASING_BLOCKS = new Interface_Texture[64]; @@ -85,6 +71,7 @@ public class GregtechTextures { } public static class CustomIcon implements Interface_IconContainer, Runnable { + protected IIcon mIcon; protected String mIconName; @@ -116,6 +103,7 @@ public class GregtechTextures { } public enum ItemIcons implements Interface_IconContainer, Runnable { + VOID, // The Empty Texture RENDERING_ERROR, // The Purple/Black Texture SKOOKUMCHOOCHER, // The Skookum Tool Texture @@ -124,29 +112,13 @@ public class GregtechTextures { TURBINE_LARGE, TURBINE_HUGE; - /* public static final Interface_IconContainer[] - DURABILITY_BAR = new Interface_IconContainer[]{ - DURABILITY_BAR_0, - DURABILITY_BAR_1, - DURABILITY_BAR_2, - DURABILITY_BAR_3, - DURABILITY_BAR_4, - DURABILITY_BAR_5, - DURABILITY_BAR_6, - DURABILITY_BAR_7, - DURABILITY_BAR_8, - }, - ENERGY_BAR = new Interface_IconContainer[]{ - ENERGY_BAR_0, - ENERGY_BAR_1, - ENERGY_BAR_2, - ENERGY_BAR_3, - ENERGY_BAR_4, - ENERGY_BAR_5, - ENERGY_BAR_6, - ENERGY_BAR_7, - ENERGY_BAR_8, - };*/ + /* + * public static final Interface_IconContainer[] DURABILITY_BAR = new Interface_IconContainer[]{ + * DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, + * DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, }, ENERGY_BAR = new Interface_IconContainer[]{ + * ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, + * ENERGY_BAR_7, ENERGY_BAR_8, }; + */ // public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new // GregtechRenderedTexture(RENDERING_ERROR)}; @@ -179,6 +151,7 @@ public class GregtechTextures { } public static class CustomIcon implements Interface_IconContainer, Runnable { + protected IIcon mIcon, mOverlay; protected String mIconName; |