diff options
Diffstat (limited to 'src/main/java/gregtech/api/enums')
20 files changed, 3666 insertions, 3966 deletions
diff --git a/src/main/java/gregtech/api/enums/Dyes.java b/src/main/java/gregtech/api/enums/Dyes.java index 3b87e9ff67..2970219145 100644 --- a/src/main/java/gregtech/api/enums/Dyes.java +++ b/src/main/java/gregtech/api/enums/Dyes.java @@ -43,7 +43,7 @@ public enum Dyes implements IColorModulationContainer { MACHINE_METAL(-1, 210, 220, 255, "Machine Metal"); public static final Dyes[] VALUES = { dyeBlack, dyeRed, dyeGreen, dyeBrown, dyeBlue, dyePurple, dyeCyan, - dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite }; + dyeLightGray, dyeGray, dyePink, dyeLime, dyeYellow, dyeLightBlue, dyeMagenta, dyeOrange, dyeWhite }; public final byte mIndex; public final String mName; diff --git a/src/main/java/gregtech/api/enums/Element.java b/src/main/java/gregtech/api/enums/Element.java index c66b9630a3..b4bcb01a41 100644 --- a/src/main/java/gregtech/api/enums/Element.java +++ b/src/main/java/gregtech/api/enums/Element.java @@ -296,7 +296,7 @@ public enum Element { * @param aName Name of the Element */ Element(long aProtons, long aNeutrons, long aAdditionalMass, long aHalfLifeSeconds, String aDecayTo, String aName, - boolean aIsIsotope) { + boolean aIsIsotope) { mProtons = aProtons; mNeutrons = aNeutrons; mAdditionalMass = aAdditionalMass; diff --git a/src/main/java/gregtech/api/enums/FluidState.java b/src/main/java/gregtech/api/enums/FluidState.java index e84657cc6a..5f6f8824f5 100644 --- a/src/main/java/gregtech/api/enums/FluidState.java +++ b/src/main/java/gregtech/api/enums/FluidState.java @@ -12,6 +12,6 @@ public enum FluidState { public static FluidState fromValue(int stateValue) { return stateValue >= 0 && stateValue < FluidState.VALID_STATES.length ? FluidState.VALID_STATES[stateValue] - : FluidState.LIQUID; + : FluidState.LIQUID; } } diff --git a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java index c0a259197e..0b621d4461 100644 --- a/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java +++ b/src/main/java/gregtech/api/enums/GTNH_ExtraMaterials.java @@ -15,604 +15,604 @@ public class GTNH_ExtraMaterials implements IMaterialHandler { * This Class is for adding new Materials since Java has a Limiation of 64kb per Method / Class header */ public static Materials Signalum = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "Signalum", - "Signalum", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "Signalum", + "Signalum", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Lumium = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "Lumium", - "Lumium", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "Lumium", + "Lumium", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials EnrichedCopper = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "EnrichedCopper", - "Enriched Copper", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "EnrichedCopper", + "Enriched Copper", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials DiamondCopper = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "DiamondCopper", - "Diamond Copper", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "DiamondCopper", + "Diamond Copper", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials TarPitch = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "TarPitch", - "Tar Pitch", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "TarPitch", + "Tar Pitch", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials LimePure = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "LimePure", - "Pure Lime", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeLime); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 0, + 0, + 255, + 255, + 255, + 0, + "LimePure", + "Pure Lime", + 0, + 0, + -1, + 0, + false, + false, + 1, + 1, + 1, + Dyes.dyeLime); public static Materials Wimalite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 8, - 255, - 255, - 255, - 0, - "Wimalite", - "Wimalite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeYellow); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 8, + 255, + 255, + 255, + 0, + "Wimalite", + "Wimalite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes.dyeYellow); public static Materials Yellorite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 8, - 255, - 255, - 255, - 0, - "Yellorite", - "Yellorite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeYellow); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 8, + 255, + 255, + 255, + 0, + "Yellorite", + "Yellorite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes.dyeYellow); public static Materials Quantum = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 0, - 0, - 255, - 255, - 255, - 0, - "Quantum", - "Quantum", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes.dyeWhite); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 0, + 0, + 255, + 255, + 255, + 0, + "Quantum", + "Quantum", + 0, + 0, + -1, + 0, + false, + false, + 1, + 1, + 1, + Dyes.dyeWhite); public static Materials Turquoise = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1, - 255, - 255, - 255, - 0, - "Turquoise", - "Turquoise", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1, + 255, + 255, + 255, + 0, + "Turquoise", + "Turquoise", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Tapazite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1, - 255, - 255, - 255, - 0, - "Tapazite", - "Tapazite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeGreen); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1, + 255, + 255, + 255, + 0, + "Tapazite", + "Tapazite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes.dyeGreen); public static Materials Thyrium = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1 | 2 | 8, - 255, - 255, - 255, - 0, - "Thyrium", - "Thyrium", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1 | 2 | 8, + 255, + 255, + 255, + 0, + "Thyrium", + "Thyrium", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Tourmaline = new Materials( - -1, - TextureSet.SET_RUBY, - 1.0F, - 0, - 1, - 1, - 255, - 255, - 255, - 0, - "Tourmaline", - "Tourmaline", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_RUBY, + 1.0F, + 0, + 1, + 1, + 255, + 255, + 255, + 0, + "Tourmaline", + "Tourmaline", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Spinel = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 0, - 255, - 255, - 255, - 0, - "Spinel", - "Spinel", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 0, + 255, + 255, + 255, + 0, + "Spinel", + "Spinel", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Starconium = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1 | 2 | 8, - 255, - 255, - 255, - 0, - "Starconium", - "Starconium", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1 | 2 | 8, + 255, + 255, + 255, + 0, + "Starconium", + "Starconium", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Sugilite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1, - 255, - 255, - 255, - 0, - "Sugilite", - "Sugilite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1, + 255, + 255, + 255, + 0, + "Sugilite", + "Sugilite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Prismarine = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 4, - 255, - 255, - 255, - 0, - "Prismarine", - "Prismarine", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 4, + 255, + 255, + 255, + 0, + "Prismarine", + "Prismarine", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials GraveyardDirt = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1, - 255, - 255, - 255, - 0, - "GraveyardDirt", - "Graveyard Dirt", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1, + 255, + 255, + 255, + 0, + "GraveyardDirt", + "Graveyard Dirt", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Tennantite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1, - 255, - 255, - 255, - 0, - "Tennantite", - "Tennantite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1, + 255, + 255, + 255, + 0, + "Tennantite", + "Tennantite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Fairy = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "Fairy", - "Fairy", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "Fairy", + "Fairy", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Ludicrite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 1 | 2, - 255, - 255, - 255, - 0, - "Ludicrite", - "Ludicrite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 1 | 2, + 255, + 255, + 255, + 0, + "Ludicrite", + "Ludicrite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials AquaRegia = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 0, - 255, - 255, - 255, - 0, - "AquaRegia", - "Aqua Regia", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 0, + 255, + 255, + 255, + 0, + "AquaRegia", + "Aqua Regia", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials SolutionBlueVitriol = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 0, - 255, - 255, - 255, - 0, - "SolutionBlueVitriol", - "Blue Vitriol Solution", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 0, + 255, + 255, + 255, + 0, + "SolutionBlueVitriol", + "Blue Vitriol Solution", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials SolutionNickelSulfate = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 2, - 0, - 255, - 255, - 255, - 0, - "SolutionNickelSulfate", - "Nickel Sulfate Solution", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 2, + 0, + 255, + 255, + 255, + 0, + "SolutionNickelSulfate", + "Nickel Sulfate Solution", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes._NULL); public static Materials Lodestone = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1 | 8, - 255, - 255, - 255, - 0, - "Lodestone", - "Lodestone", - 0, - 0, - -1, - 0, - false, - false, - 1, - 1, - 1, - Dyes._NULL); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1 | 8, + 255, + 255, + 255, + 0, + "Lodestone", + "Lodestone", + 0, + 0, + -1, + 0, + false, + false, + 1, + 1, + 1, + Dyes._NULL); public static Materials Luminite = new Materials( - -1, - TextureSet.SET_NONE, - 1.0F, - 0, - 1, - 1 | 8, - 250, - 250, - 250, - 0, - "Luminite", - "Luminite", - 0, - 0, - -1, - 0, - false, - false, - 3, - 1, - 1, - Dyes.dyeWhite); + -1, + TextureSet.SET_NONE, + 1.0F, + 0, + 1, + 1 | 8, + 250, + 250, + 250, + 0, + "Luminite", + "Luminite", + 0, + 0, + -1, + 0, + false, + false, + 3, + 1, + 1, + Dyes.dyeWhite); private static void initSubTags() { SubTag.METAL.addTo(Signalum, Lumium, EnrichedCopper, DiamondCopper); diff --git a/src/main/java/gregtech/api/enums/GT_HatchElement.java b/src/main/java/gregtech/api/enums/GT_HatchElement.java index ac8dc7c4dd..3a21d5a2eb 100644 --- a/src/main/java/gregtech/api/enums/GT_HatchElement.java +++ b/src/main/java/gregtech/api/enums/GT_HatchElement.java @@ -28,7 +28,7 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc } }, Maintenance(GT_MetaTileEntity_MultiBlockBase::addMaintenanceToMachineList, - GT_MetaTileEntity_Hatch_Maintenance.class) { + GT_MetaTileEntity_Hatch_Maintenance.class) { @Override public long count(GT_MetaTileEntity_MultiBlockBase t) { @@ -87,7 +87,7 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc @Override public long count(GT_MetaTileEntity_MultiBlockBase t) { return t.getExoticEnergyHatches() - .size(); + .size(); } },; @@ -96,7 +96,7 @@ public enum GT_HatchElement implements IHatchElement<GT_MetaTileEntity_MultiBloc @SafeVarargs GT_HatchElement(IGT_HatchAdder<GT_MetaTileEntity_MultiBlockBase> adder, - Class<? extends IMetaTileEntity>... mteClasses) { + Class<? extends IMetaTileEntity>... mteClasses) { this.mteClasses = Collections.unmodifiableList(Arrays.asList(mteClasses)); this.adder = adder; } diff --git a/src/main/java/gregtech/api/enums/GT_Values.java b/src/main/java/gregtech/api/enums/GT_Values.java index 8aca75c6e1..a6a7d6d45c 100644 --- a/src/main/java/gregtech/api/enums/GT_Values.java +++ b/src/main/java/gregtech/api/enums/GT_Values.java @@ -47,8 +47,8 @@ public class GT_Values { */ @SuppressWarnings("PointlessBitwiseExpression") // Nicer source layout this way public static final int[] B = new int[] { 1 << 0, 1 << 1, 1 << 2, 1 << 3, 1 << 4, 1 << 5, 1 << 6, 1 << 7, 1 << 8, - 1 << 9, 1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, 1 << 17, 1 << 18, 1 << 19, 1 << 20, - 1 << 21, 1 << 22, 1 << 23, 1 << 24, 1 << 25, 1 << 26, 1 << 27, 1 << 28, 1 << 29, 1 << 30, 1 << 31 }; + 1 << 9, 1 << 10, 1 << 11, 1 << 12, 1 << 13, 1 << 14, 1 << 15, 1 << 16, 1 << 17, 1 << 18, 1 << 19, 1 << 20, + 1 << 21, 1 << 22, 1 << 23, 1 << 24, 1 << 25, 1 << 26, 1 << 27, 1 << 28, 1 << 29, 1 << 30, 1 << 31 }; /** * Renamed from "MATERIAL_UNIT" to just "M" @@ -78,9 +78,9 @@ public class GT_Values { * The Voltage Tiers. Use this Array instead of the old named Voltage Variables */ public static final long[] V = new long[] { 8L, 32L, 128L, 512L, 2048L, 8192L, 32_768L, 131_072L, 524_288L, - 2_097_152L, 8_388_608L, 33_554_432L, 134_217_728L, 536_870_912L, Integer.MAX_VALUE - 7, - // Error tier to prevent out of bounds errors. Not really a real tier (for now). - 8_589_934_592L }; + 2_097_152L, 8_388_608L, 33_554_432L, 134_217_728L, 536_870_912L, Integer.MAX_VALUE - 7, + // Error tier to prevent out of bounds errors. Not really a real tier (for now). + 8_589_934_592L }; /** * The Voltage Practical. These are recipe voltage you should use if you expect the recipe to use a full amp of that @@ -88,12 +88,12 @@ public class GT_Values { */ // this will correctly map ULV to 7. public static final long[] VP = Arrays.stream(V) - .map( - i -> BigInteger.valueOf(i) - .multiply(BigInteger.valueOf(30)) - .divide(BigInteger.valueOf(32)) - .longValueExact()) - .toArray(); + .map( + i -> BigInteger.valueOf(i) + .multiply(BigInteger.valueOf(30)) + .divide(BigInteger.valueOf(32)) + .longValueExact()) + .toArray(); // Why -7? Mystery of the universe. Something may break if you change this so please do not without extensive // testing. // TODO:Adding that in coremod!!! @@ -117,65 +117,65 @@ public class GT_Values { * </p> */ public static final long[] AatV = new long[] { 268435455, 67108863, 16777215, 4194303, 1048575, 262143, 65535, - 16383, 4095, 1023, 255, 63, 15, 3, 1, 1 }; + 16383, 4095, 1023, 255, 63, 15, 3, 1, 1 }; /** * The short Names for the Voltages */ public static final String[] VN = new String[] { "ULV", // 0 - "LV", // 1 - "MV", // 2 - "HV", // 3 - "EV", // 4 - "IV", // 5 - "LuV", // 6 - "ZPM", // 7 - "UV", // 8 - "UHV", // 9 - "UEV", // 10 - "UIV", // 11 - "UMV", // 12 - "UXV", // 13 - "MAX", // 14 - "ERROR VOLTAGE" // 15 + "LV", // 1 + "MV", // 2 + "HV", // 3 + "EV", // 4 + "IV", // 5 + "LuV", // 6 + "ZPM", // 7 + "UV", // 8 + "UHV", // 9 + "UEV", // 10 + "UIV", // 11 + "UMV", // 12 + "UXV", // 13 + "MAX", // 14 + "ERROR VOLTAGE" // 15 }; /** * The long Names for the Voltages */ public static final String[] VOLTAGE_NAMES = new String[] { "Ultra Low Voltage", // 0 - "Low Voltage", // 1 - "Medium Voltage", // 2 - "High Voltage", // 3 - "Extreme Voltage", // 4 - "Insane Voltage", // 5 - "Ludicrous Voltage", // 6 - "ZPM Voltage", // 7 - "Ultimate Voltage", // 8 - "Ultimate High Voltage", // 9 - "Ultimate Extreme Voltage", // 10 - "Ultimate Insane Voltage", // 11 - "Ultimate Mega Voltage", // 12 - "Ultimate Extended Mega Voltage", // 13 - "Maximum Voltage", // 14 - "Error Voltage, report this" // 15 + "Low Voltage", // 1 + "Medium Voltage", // 2 + "High Voltage", // 3 + "Extreme Voltage", // 4 + "Insane Voltage", // 5 + "Ludicrous Voltage", // 6 + "ZPM Voltage", // 7 + "Ultimate Voltage", // 8 + "Ultimate High Voltage", // 9 + "Ultimate Extreme Voltage", // 10 + "Ultimate Insane Voltage", // 11 + "Ultimate Mega Voltage", // 12 + "Ultimate Extended Mega Voltage", // 13 + "Maximum Voltage", // 14 + "Error Voltage, report this" // 15 }; public static final String[] TIER_COLORS = new String[] { EnumChatFormatting.RED.toString(), // ULV, 0 - EnumChatFormatting.GRAY.toString(), // LV, 1 - EnumChatFormatting.GOLD.toString(), // MV, 2 - EnumChatFormatting.YELLOW.toString(), // HV, 3 - EnumChatFormatting.DARK_GRAY.toString(), // EV, 4 - EnumChatFormatting.GREEN.toString(), // IV, 5 - EnumChatFormatting.LIGHT_PURPLE.toString(), // LuV, 6 - EnumChatFormatting.AQUA.toString(), // ZPM, 7 - EnumChatFormatting.DARK_GREEN.toString(), // UV, 8 - EnumChatFormatting.DARK_RED.toString(), // UHV, 9 - EnumChatFormatting.DARK_PURPLE.toString(), // UEV, 10 - EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD, // UIV, 11 - EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UMV, 12 - EnumChatFormatting.DARK_RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UXV, 13 - EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // MAX, 14 - EnumChatFormatting.OBFUSCATED.toString() // ~~~, 15 + EnumChatFormatting.GRAY.toString(), // LV, 1 + EnumChatFormatting.GOLD.toString(), // MV, 2 + EnumChatFormatting.YELLOW.toString(), // HV, 3 + EnumChatFormatting.DARK_GRAY.toString(), // EV, 4 + EnumChatFormatting.GREEN.toString(), // IV, 5 + EnumChatFormatting.LIGHT_PURPLE.toString(), // LuV, 6 + EnumChatFormatting.AQUA.toString(), // ZPM, 7 + EnumChatFormatting.DARK_GREEN.toString(), // UV, 8 + EnumChatFormatting.DARK_RED.toString(), // UHV, 9 + EnumChatFormatting.DARK_PURPLE.toString(), // UEV, 10 + EnumChatFormatting.DARK_BLUE.toString() + EnumChatFormatting.BOLD, // UIV, 11 + EnumChatFormatting.RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UMV, 12 + EnumChatFormatting.DARK_RED.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // UXV, 13 + EnumChatFormatting.WHITE.toString() + EnumChatFormatting.BOLD + EnumChatFormatting.UNDERLINE, // MAX, 14 + EnumChatFormatting.OBFUSCATED.toString() // ~~~, 15 }; /** @@ -285,64 +285,64 @@ public class GT_Values { public static final class NBT { public static final String COLOR = "gt.color", // Integer - COVERS = "gt.covers", // String - CUSTOM_NAME = "name", // String - DISPAY = "gt.display", // String - TIER = "gt.tier", // Number - FACING = "gt.facing", // Byte - LOCK_UPGRADE = "gt.locked", // Boolean - MATERIAL = "gt.material", // String containing the Material Name. - MODE = "gt.mode", // Number - ALLOWED_MODES = "gt.amode", // Number - MTE_ID = "gt.mte.id", // Containing the MTE ID - MTE_REG = "gt.mte.reg", // Containing the MTE Registry ID - OWNER = "gt.owner", // String - OWNER_UUID = "gt.ownerUuid", // UUID (String) - - // Machines - ACTIVE = "gt.active", // Boolean - FLUID_OUT = "gt.fluidout", // Output Fluid - ITEM_OUT = "gt.itemout", // Output Item - PARALLEL = "gt.parallel", // Number - TANK_CAPACITY = "gt.tankcap", // Number - TANK_IN = "gt.tank.in.", // FluidStack - TANK_OUT = "gt.tank.out.", // FluidStack - TEXTURE = "gt.texture", // String - INV_INPUT_SIZE = "gt.invsize.in", // Number - INV_OUTPUT_SIZE = "gt.invsize.out", // Number - INV_INPUT_LIST = "gt.invlist.in", // NBT List - INV_OUTPUT_LIST = "gt.invlist.out", // NBT List - VOLTAGE = "gt.voltage", // Number - AMPERAGE = "gt.amperage", // Number - STORED_ENERGY = "gt.stored.energy", // Number - MAXIMUM_ENERGY = "gt.maximum.energy", // Number - EUT_CONSUMPTION = "gt.eut.consumption", // Number - BURN_TIME_LEFT = "gt.burn.time.left", // Number - TOTAL_BURN_TIME = "gt.total.burn.time", // Number - ALLOWED_WORK = "gt.allowed.work", // Boolean - - // MultiBlock - STRUCTURE_OK = "gt.structure.ok", ROTATION = "gt.eRotation", FLIP = "gt.eFlip", TARGET = "gt.target", // Boolean - TARGET_X = "gt.target.x", // Number - TARGET_Y = "gt.target.y", // Number - TARGET_Z = "gt.target.z", // Number - LOCKED_INVENTORY = "gt.locked.inventory", // String - LOCKED_INVENTORY_INDEX = "gt.locked.inventory.index", // Number - UPGRADE_INVENTORY_SIZE = "gt.invsize.upg", // String - UPGRADE_INVENTORY_UUID = "gt.invuuid.upg", // String - UPGRADE_INVENTORY_NAME = "gt.invname.upg", // String - UPGRADE_INVENTORIES_INPUT = "gt.invlist.upg.in", // NBT List - UPGRADE_INVENTORIES_OUTPUT = "gt.invlist.upg.out", // NBT List - SEPARATE_INPUTS = "gt.separate.inputs", // Boolean - - // Logic - POWER_LOGIC = "gt.power.logic", // NBT Tag - POWER_LOGIC_STORED_ENERGY = "gt.power.logic.stored.energy", // Number - POWER_LOGIC_ENERGY_CAPACITY = "gt.power.logic.energy.capacity", // Number - POWER_LOGIC_VOLTAGE = "gt.power.logic.voltage", // Number - POWER_LOGIC_AMPERAGE = "gt.power.logic.voltage", // Number - POWER_LOGIC_TYPE = "gt.power.logic.type", // Number - empty_ = ""; + COVERS = "gt.covers", // String + CUSTOM_NAME = "name", // String + DISPAY = "gt.display", // String + TIER = "gt.tier", // Number + FACING = "gt.facing", // Byte + LOCK_UPGRADE = "gt.locked", // Boolean + MATERIAL = "gt.material", // String containing the Material Name. + MODE = "gt.mode", // Number + ALLOWED_MODES = "gt.amode", // Number + MTE_ID = "gt.mte.id", // Containing the MTE ID + MTE_REG = "gt.mte.reg", // Containing the MTE Registry ID + OWNER = "gt.owner", // String + OWNER_UUID = "gt.ownerUuid", // UUID (String) + + // Machines + ACTIVE = "gt.active", // Boolean + FLUID_OUT = "gt.fluidout", // Output Fluid + ITEM_OUT = "gt.itemout", // Output Item + PARALLEL = "gt.parallel", // Number + TANK_CAPACITY = "gt.tankcap", // Number + TANK_IN = "gt.tank.in.", // FluidStack + TANK_OUT = "gt.tank.out.", // FluidStack + TEXTURE = "gt.texture", // String + INV_INPUT_SIZE = "gt.invsize.in", // Number + INV_OUTPUT_SIZE = "gt.invsize.out", // Number + INV_INPUT_LIST = "gt.invlist.in", // NBT List + INV_OUTPUT_LIST = "gt.invlist.out", // NBT List + VOLTAGE = "gt.voltage", // Number + AMPERAGE = "gt.amperage", // Number + STORED_ENERGY = "gt.stored.energy", // Number + MAXIMUM_ENERGY = "gt.maximum.energy", // Number + EUT_CONSUMPTION = "gt.eut.consumption", // Number + BURN_TIME_LEFT = "gt.burn.time.left", // Number + TOTAL_BURN_TIME = "gt.total.burn.time", // Number + ALLOWED_WORK = "gt.allowed.work", // Boolean + + // MultiBlock + STRUCTURE_OK = "gt.structure.ok", ROTATION = "gt.eRotation", FLIP = "gt.eFlip", TARGET = "gt.target", // Boolean + TARGET_X = "gt.target.x", // Number + TARGET_Y = "gt.target.y", // Number + TARGET_Z = "gt.target.z", // Number + LOCKED_INVENTORY = "gt.locked.inventory", // String + LOCKED_INVENTORY_INDEX = "gt.locked.inventory.index", // Number + UPGRADE_INVENTORY_SIZE = "gt.invsize.upg", // String + UPGRADE_INVENTORY_UUID = "gt.invuuid.upg", // String + UPGRADE_INVENTORY_NAME = "gt.invname.upg", // String + UPGRADE_INVENTORIES_INPUT = "gt.invlist.upg.in", // NBT List + UPGRADE_INVENTORIES_OUTPUT = "gt.invlist.upg.out", // NBT List + SEPARATE_INPUTS = "gt.separate.inputs", // Boolean + + // Logic + POWER_LOGIC = "gt.power.logic", // NBT Tag + POWER_LOGIC_STORED_ENERGY = "gt.power.logic.stored.energy", // Number + POWER_LOGIC_ENERGY_CAPACITY = "gt.power.logic.energy.capacity", // Number + POWER_LOGIC_VOLTAGE = "gt.power.logic.voltage", // Number + POWER_LOGIC_AMPERAGE = "gt.power.logic.voltage", // Number + POWER_LOGIC_TYPE = "gt.power.logic.type", // Number + empty_ = ""; } /** The Color White as RGB Short Array. */ @@ -358,8 +358,8 @@ public class GT_Values { // stupidly // mirrored // Texture - SIDE_SOUTH = 3, SIDE_WEST = 4, SIDE_EAST = 5, // Also a Side with a stupidly mirrored Texture - SIDE_ANY = 6, SIDE_UNKNOWN = 6, SIDE_INVALID = 6, SIDE_INSIDE = 6, SIDE_UNDEFINED = 6; + SIDE_SOUTH = 3, SIDE_WEST = 4, SIDE_EAST = 5, // Also a Side with a stupidly mirrored Texture + SIDE_ANY = 6, SIDE_UNKNOWN = 6, SIDE_INVALID = 6, SIDE_INSIDE = 6, SIDE_UNDEFINED = 6; /** Compass alike Array for the proper ordering of North, East, South and West. */ public static final byte[] COMPASS_DIRECTIONS = { SIDE_NORTH, SIDE_EAST, SIDE_SOUTH, SIDE_WEST }; @@ -373,13 +373,13 @@ public class GT_Values { * For Facing Checks. */ public static final boolean[] INVALID_SIDES = { false, false, false, false, false, false, true }, - VALID_SIDES = { true, true, true, true, true, true, false }; + VALID_SIDES = { true, true, true, true, true, true, false }; /** * Side->Offset Mappings. */ public static final byte[] OFFX = { 0, 0, 0, 0, -1, +1, 0 }, OFFY = { -1, +1, 0, 0, 0, 0, 0 }, - OFFZ = { 0, 0, -1, +1, 0, 0, 0 }; + OFFZ = { 0, 0, -1, +1, 0, 0, 0 }; /** * Side->Opposite Mappings. @@ -391,8 +391,8 @@ public class GT_Values { * front, 4 = right, 5 = back, 6 = undefined. */ public static final byte[][] FACING_ROTATIONS = { { 0, 1, 2, 3, 4, 5, 6 }, { 0, 1, 2, 3, 4, 5, 6 }, - { 0, 1, 3, 5, 4, 2, 6 }, { 0, 1, 5, 3, 2, 4, 6 }, { 0, 1, 2, 4, 3, 5, 6 }, { 0, 1, 4, 2, 5, 3, 6 }, - { 0, 1, 2, 3, 4, 5, 6 } }; + { 0, 1, 3, 5, 4, 2, 6 }, { 0, 1, 5, 3, 2, 4, 6 }, { 0, 1, 2, 4, 3, 5, 6 }, { 0, 1, 4, 2, 5, 3, 6 }, + { 0, 1, 2, 3, 4, 5, 6 } }; /** * The Mod Object itself. That is the GT_Mod-Object. It's needed to open GUI's and similar. @@ -530,63 +530,63 @@ public class GT_Values { * Pretty formatting for author names. */ public static final String Colen = "" + EnumChatFormatting.DARK_RED - + EnumChatFormatting.BOLD - + EnumChatFormatting.ITALIC - + EnumChatFormatting.UNDERLINE - + "C" - + EnumChatFormatting.GOLD - + EnumChatFormatting.BOLD - + EnumChatFormatting.ITALIC - + EnumChatFormatting.UNDERLINE - + "o" - + EnumChatFormatting.GREEN - + EnumChatFormatting.BOLD - + EnumChatFormatting.ITALIC - + EnumChatFormatting.UNDERLINE - + "l" - + EnumChatFormatting.DARK_AQUA - + EnumChatFormatting.BOLD - + EnumChatFormatting.ITALIC - + EnumChatFormatting.UNDERLINE - + "e" - + EnumChatFormatting.DARK_PURPLE - + EnumChatFormatting.BOLD - + EnumChatFormatting.ITALIC - + EnumChatFormatting.UNDERLINE - + "n"; + + EnumChatFormatting.BOLD + + EnumChatFormatting.ITALIC + + EnumChatFormatting.UNDERLINE + + "C" + + EnumChatFormatting.GOLD + + EnumChatFormatting.BOLD + + EnumChatFormatting.ITALIC + + EnumChatFormatting.UNDERLINE + + "o" + + EnumChatFormatting.GREEN + + EnumChatFormatting.BOLD + + EnumChatFormatting.ITALIC + + EnumChatFormatting.UNDERLINE + + "l" + + EnumChatFormatting.DARK_AQUA + + EnumChatFormatting.BOLD + + EnumChatFormatting.ITALIC + + EnumChatFormatting.UNDERLINE + + "e" + + EnumChatFormatting.DARK_PURPLE + + EnumChatFormatting.BOLD + + EnumChatFormatting.ITALIC + + EnumChatFormatting.UNDERLINE + + "n"; public static final String AuthorColen = "Author: " + Colen; public static final String AuthorKuba = "Author: " + EnumChatFormatting.DARK_RED - + EnumChatFormatting.BOLD - + "k" - + EnumChatFormatting.RED - + EnumChatFormatting.BOLD - + "u" - + EnumChatFormatting.GOLD - + EnumChatFormatting.BOLD - + "b" - + EnumChatFormatting.YELLOW - + EnumChatFormatting.BOLD - + "a" - + EnumChatFormatting.DARK_GREEN - + EnumChatFormatting.BOLD - + "6" - + EnumChatFormatting.GREEN - + EnumChatFormatting.BOLD - + "0" - + EnumChatFormatting.AQUA - + EnumChatFormatting.BOLD - + "0" - + EnumChatFormatting.DARK_AQUA - + EnumChatFormatting.BOLD - + "0"; + + EnumChatFormatting.BOLD + + "k" + + EnumChatFormatting.RED + + EnumChatFormatting.BOLD + + "u" + + EnumChatFormatting.GOLD + + EnumChatFormatting.BOLD + + "b" + + EnumChatFormatting.YELLOW + + EnumChatFormatting.BOLD + + "a" + + EnumChatFormatting.DARK_GREEN + + EnumChatFormatting.BOLD + + "6" + + EnumChatFormatting.GREEN + + EnumChatFormatting.BOLD + + "0" + + EnumChatFormatting.AQUA + + EnumChatFormatting.BOLD + + "0" + + EnumChatFormatting.DARK_AQUA + + EnumChatFormatting.BOLD + + "0"; public static final String AuthorBlueWeabo = "Author: " + EnumChatFormatting.BLUE - + EnumChatFormatting.BOLD - + "Blue" - + EnumChatFormatting.AQUA - + EnumChatFormatting.BOLD - + "Weabo"; + + EnumChatFormatting.BOLD + + "Blue" + + EnumChatFormatting.AQUA + + EnumChatFormatting.BOLD + + "Weabo"; // 7.5F comes from GT_Tool_Turbine_Large#getBaseDamage() given huge turbines are the most efficient now. public static double getMaxPlasmaTurbineEfficiencyFromMaterial(Materials material) { @@ -613,9 +613,9 @@ public class GT_Values { } private static final long[] EXPLOSION_LOOKUP_V = new long[] { V[0], V[1], V[2], V[3], V[4], V[4] * 2, V[5], V[6], - V[7], V[8], V[8] * 2, V[9], V[10], V[11], V[12], V[12] * 2, V[13], V[14], V[15] }; + V[7], V[8], V[8] * 2, V[9], V[10], V[11], V[12], V[12] * 2, V[13], V[14], V[15] }; private static final float[] EXPLOSION_LOOKUP_POWER = new float[] { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F, 7.0F, 8.0F, - 9.0F, 10.0F, 11.0F, 12.0F, 13.0F, 14.0F, 15.0F, 16.0F, 17.0F, 18.0F, 19.0F, 20.0F }; + 9.0F, 10.0F, 11.0F, 12.0F, 13.0F, 14.0F, 15.0F, 16.0F, 17.0F, 18.0F, 19.0F, 20.0F }; public static float getExplosionPowerForVoltage(long voltage) { for (int i = 0; i < EXPLOSION_LOOKUP_V.length; i++) { diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java index b855dbc211..59b094c4c0 100644 --- a/src/main/java/gregtech/api/enums/ItemList.java +++ b/src/main/java/gregtech/api/enums/ItemList.java @@ -2023,39 +2023,37 @@ public enum ItemList implements IItemContainer { Machine_Multi_TranscendentPlasmaMixer; public static final ItemList[] DYE_ONLY_ITEMS = { Color_00, Color_01, Color_02, Color_03, Color_04, Color_05, - Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, - SPRAY_CAN_DYES = { Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, - Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, - Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15 }, - SPRAY_CAN_DYES_USED = { Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, - Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, - Spray_Color_Used_08, Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, - Spray_Color_Used_12, Spray_Color_Used_13, Spray_Color_Used_14, Spray_Color_Used_15 }, - TRANSFORMERS = { Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, - Transformer_IV_EV, Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, - Transformer_MAX_UV }, - MACHINE_HULLS = { Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, - Hull_MAX }, - HATCHES_DYNAMO = { Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, - Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX }, - HATCHES_ENERGY = { Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, - Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX }, - HATCHES_INPUT = { Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, - Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX }, - HATCHES_INPUT_BUS = { Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, - Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, - Hatch_Input_Bus_UV, Hatch_Input_Bus_MAX }, - HATCHES_OUTPUT = { Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, - Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX }, - HATCHES_OUTPUT_BUS = { Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, - Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, - Hatch_Output_Bus_UV, Hatch_Output_Bus_MAX }, - HATCHES_MUFFLER = { Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, - Hatch_Muffler_EV, Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, - Hatch_Muffler_MAX }; + Color_06, Color_07, Color_08, Color_09, Color_10, Color_11, Color_12, Color_13, Color_14, Color_15 }, + SPRAY_CAN_DYES = { Spray_Color_00, Spray_Color_01, Spray_Color_02, Spray_Color_03, Spray_Color_04, + Spray_Color_05, Spray_Color_06, Spray_Color_07, Spray_Color_08, Spray_Color_09, Spray_Color_10, + Spray_Color_11, Spray_Color_12, Spray_Color_13, Spray_Color_14, Spray_Color_15 }, + SPRAY_CAN_DYES_USED = { Spray_Color_Used_00, Spray_Color_Used_01, Spray_Color_Used_02, Spray_Color_Used_03, + Spray_Color_Used_04, Spray_Color_Used_05, Spray_Color_Used_06, Spray_Color_Used_07, Spray_Color_Used_08, + Spray_Color_Used_09, Spray_Color_Used_10, Spray_Color_Used_11, Spray_Color_Used_12, Spray_Color_Used_13, + Spray_Color_Used_14, Spray_Color_Used_15 }, + TRANSFORMERS = { Transformer_LV_ULV, Transformer_MV_LV, Transformer_HV_MV, Transformer_EV_HV, Transformer_IV_EV, + Transformer_LuV_IV, Transformer_ZPM_LuV, Transformer_UV_ZPM, Transformer_MAX_UV }, + MACHINE_HULLS = { Hull_ULV, Hull_LV, Hull_MV, Hull_HV, Hull_EV, Hull_IV, Hull_LuV, Hull_ZPM, Hull_UV, + Hull_MAX }, + HATCHES_DYNAMO = { Hatch_Dynamo_ULV, Hatch_Dynamo_LV, Hatch_Dynamo_MV, Hatch_Dynamo_HV, Hatch_Dynamo_EV, + Hatch_Dynamo_IV, Hatch_Dynamo_LuV, Hatch_Dynamo_ZPM, Hatch_Dynamo_UV, Hatch_Dynamo_MAX }, + HATCHES_ENERGY = { Hatch_Energy_ULV, Hatch_Energy_LV, Hatch_Energy_MV, Hatch_Energy_HV, Hatch_Energy_EV, + Hatch_Energy_IV, Hatch_Energy_LuV, Hatch_Energy_ZPM, Hatch_Energy_UV, Hatch_Energy_MAX }, + HATCHES_INPUT = { Hatch_Input_ULV, Hatch_Input_LV, Hatch_Input_MV, Hatch_Input_HV, Hatch_Input_EV, + Hatch_Input_IV, Hatch_Input_LuV, Hatch_Input_ZPM, Hatch_Input_UV, Hatch_Input_MAX }, + HATCHES_INPUT_BUS = { Hatch_Input_Bus_ULV, Hatch_Input_Bus_LV, Hatch_Input_Bus_MV, Hatch_Input_Bus_HV, + Hatch_Input_Bus_EV, Hatch_Input_Bus_IV, Hatch_Input_Bus_LuV, Hatch_Input_Bus_ZPM, Hatch_Input_Bus_UV, + Hatch_Input_Bus_MAX }, + HATCHES_OUTPUT = { Hatch_Output_ULV, Hatch_Output_LV, Hatch_Output_MV, Hatch_Output_HV, Hatch_Output_EV, + Hatch_Output_IV, Hatch_Output_LuV, Hatch_Output_ZPM, Hatch_Output_UV, Hatch_Output_MAX }, + HATCHES_OUTPUT_BUS = { Hatch_Output_Bus_ULV, Hatch_Output_Bus_LV, Hatch_Output_Bus_MV, Hatch_Output_Bus_HV, + Hatch_Output_Bus_EV, Hatch_Output_Bus_IV, Hatch_Output_Bus_LuV, Hatch_Output_Bus_ZPM, Hatch_Output_Bus_UV, + Hatch_Output_Bus_MAX }, + HATCHES_MUFFLER = { Hatch_Muffler_LV, Hatch_Muffler_LV, Hatch_Muffler_MV, Hatch_Muffler_HV, Hatch_Muffler_EV, + Hatch_Muffler_IV, Hatch_Muffler_LuV, Hatch_Muffler_ZPM, Hatch_Muffler_UV, Hatch_Muffler_MAX }; public static Fluid sOilExtraHeavy, sEpichlorhydrin, sDrillingFluid, sBlueVitriol, sNickelSulfate, sGreenVitriol, - sToluene, sNitrationMixture, sRocketFuel, sHydricSulfur, sIndiumConcentrate, sLeadZincSolution, - sHydrochloricAcid; + sToluene, sNitrationMixture, sRocketFuel, sHydricSulfur, sIndiumConcentrate, sLeadZincSolution, + sHydrochloricAcid; private ItemStack mStack; private boolean mHasNotBeenSet; private boolean mDeprecated; @@ -2164,11 +2162,11 @@ public enum ItemList implements IItemContainer { final String[] tDisplayNameWords = aDisplayName.split("\\W"); for (String tWord : tDisplayNameWords) { if (tWord.length() > 0) tCamelCasedDisplayNameBuilder.append( - tWord.substring(0, 1) - .toUpperCase(Locale.US)); + tWord.substring(0, 1) + .toUpperCase(Locale.US)); if (tWord.length() > 1) tCamelCasedDisplayNameBuilder.append( - tWord.substring(1) - .toLowerCase(Locale.US)); + tWord.substring(1) + .toLowerCase(Locale.US)); } if (tCamelCasedDisplayNameBuilder.length() == 0) { // CamelCased DisplayName is empty, so use hash of aDisplayName diff --git a/src/main/java/gregtech/api/enums/MaterialBuilder.java b/src/main/java/gregtech/api/enums/MaterialBuilder.java index fd131bbc8c..92ae7c07c3 100644 --- a/src/main/java/gregtech/api/enums/MaterialBuilder.java +++ b/src/main/java/gregtech/api/enums/MaterialBuilder.java @@ -43,39 +43,39 @@ public class MaterialBuilder { this.metaItemSubID = metaItemSubID; this.iconSet = iconSet; this.name = defaultLocalName.replace(" ", "") - .replace("-", ""); + .replace("-", ""); this.defaultLocalName = defaultLocalName; } public Materials constructMaterial() { return new Materials( - metaItemSubID, - iconSet, - toolSpeed, - durability, - toolQuality, - types, - r, - g, - b, - a, - name, - defaultLocalName, - fuelType, - fuelPower, - meltingPoint, - blastFurnaceTemp, - blastFurnaceRequired, - transparent, - oreValue, - densityMultiplier, - densityDivider, - color, - extraData, - materialList, - aspects).setHasCorrespondingFluid(hasCorrespondingFluid) - .setHasCorrespondingGas(hasCorrespondingGas) - .setCanBeCracked(canBeCracked); + metaItemSubID, + iconSet, + toolSpeed, + durability, + toolQuality, + types, + r, + g, + b, + a, + name, + defaultLocalName, + fuelType, + fuelPower, + meltingPoint, + blastFurnaceTemp, + blastFurnaceRequired, + transparent, + oreValue, + densityMultiplier, + densityDivider, + color, + extraData, + materialList, + aspects).setHasCorrespondingFluid(hasCorrespondingFluid) + .setHasCorrespondingGas(hasCorrespondingGas) + .setCanBeCracked(canBeCracked); } public MaterialBuilder setName(String name) { diff --git a/src/main/java/gregtech/api/enums/Materials.java b/src/main/java/gregtech/api/enums/Materials.java index 3547f8633b..6429756039 100644 --- a/src/main/java/gregtech/api/enums/Materials.java +++ b/src/main/java/gregtech/api/enums/Materials.java @@ -980,8 +980,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public Collection<SubTag> mSubTags = new LinkedHashSet<>(); public Enchantment mEnchantmentTools = null, mEnchantmentArmors = null; public boolean mUnificatable, mBlastFurnaceRequired = false, mAutoGenerateBlastFurnaceRecipes = true, - mAutoGenerateVacuumFreezerRecipes = true, mAutoGenerateRecycleRecipes = true, mTransparent = false, - mHasParentMod = true, mHasPlasma = false, mHasGas = false, mCustomOre = false; + mAutoGenerateVacuumFreezerRecipes = true, mAutoGenerateRecycleRecipes = true, mTransparent = false, + mHasParentMod = true, mHasPlasma = false, mHasGas = false, mCustomOre = false; public byte mEnchantmentToolsLevel = 0, mEnchantmentArmorsLevel = 0, mToolQuality = 0; public short mBlastFurnaceTemp = 0; public int mMeltingPoint = 0; @@ -1011,13 +1011,13 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public int processingMaterialTierEU = 0; public long mDensity = M; public float mToolSpeed = 1.0F, mHeatDamage = 0.0F, mSteamMultiplier = 1.0F, mGasMultiplier = 1.0F, - mPlasmaMultiplier = 1.0F; + mPlasmaMultiplier = 1.0F; public String mChemicalFormula = "?", mName, mDefaultLocalName, mCustomID = "null", mConfigSection = "null", - mLocalizedName = "null"; + mLocalizedName = "null"; public Dyes mColor = Dyes._NULL; public Element mElement = null; public Materials mDirectSmelting = this, mOreReplacement = this, mMacerateInto = this, mSmeltInto = this, - mArcSmeltInto = this, mHandleMaterial = this, mMaterialInto; + mArcSmeltInto = this, mHandleMaterial = this, mMaterialInto; 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, that means 144 is one Material @@ -1029,24 +1029,24 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private Fluid[] hydroCrackedFluids = new Fluid[3], steamCrackedFluids = new Fluid[3]; public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - boolean aUnificatable, String aName, String aDefaultLocalName) { + boolean aUnificatable, String aName, String aDefaultLocalName) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aUnificatable, - aName, - aDefaultLocalName, - "ore", - false, - "null"); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aUnificatable, + aName, + aDefaultLocalName, + "ore", + false, + "null"); } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - boolean aUnificatable, String aName, String aDefaultLocalName, String aConfigSection, boolean aCustomOre, - String aCustomID) { + boolean aUnificatable, String aName, String aDefaultLocalName, String aConfigSection, boolean aCustomOre, + String aCustomID) { mMetaItemSubID = aMetaItemSubID; mDefaultLocalName = aDefaultLocalName; mName = aName; @@ -1074,68 +1074,67 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aTypes, - aR, - aG, - aB, - aA, - aName, - aDefaultLocalName, - aFuelType, - aFuelPower, - aMeltingPoint, - aBlastFurnaceTemp, - aBlastFurnaceRequired, - aTransparent, - aOreValue, - aDensityMultiplier, - aDensityDivider, - aColor, - "ore", - false, - "null"); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aTypes, + aR, + aG, + aB, + aA, + aName, + aDefaultLocalName, + aFuelType, + aFuelPower, + aMeltingPoint, + aBlastFurnaceTemp, + aBlastFurnaceRequired, + aTransparent, + aOreValue, + aDensityMultiplier, + aDensityDivider, + aColor, + "ore", + false, + "null"); } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, - String aConfigSection) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, String aConfigSection) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aTypes, - aR, - aG, - aB, - aA, - aName, - aDefaultLocalName, - aFuelType, - aFuelPower, - aMeltingPoint, - aBlastFurnaceTemp, - aBlastFurnaceRequired, - aTransparent, - aOreValue, - aDensityMultiplier, - aDensityDivider, - aColor, - aConfigSection, - false, - "null"); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aTypes, + aR, + aG, + aB, + aA, + aName, + aDefaultLocalName, + aFuelType, + aFuelPower, + aMeltingPoint, + aBlastFurnaceTemp, + aBlastFurnaceRequired, + aTransparent, + aOreValue, + aDensityMultiplier, + aDensityDivider, + aColor, + aConfigSection, + false, + "null"); } /** @@ -1159,22 +1158,22 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { * @param aColor Vanilla MC Wool Color which comes the closest to this. */ public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, - String aConfigSection, boolean aCustomOre, String aCustomID) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, String aConfigSection, + boolean aCustomOre, String aCustomID) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - true, - aName, - aDefaultLocalName, - aConfigSection, - aCustomOre, - aCustomID); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + true, + aName, + aDefaultLocalName, + aConfigSection, + aCustomOre, + aCustomID); mMeltingPoint = aMeltingPoint; mBlastFurnaceRequired = aBlastFurnaceRequired; mBlastFurnaceTemp = (short) aBlastFurnaceTemp; @@ -1197,64 +1196,64 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, - List<TC_Aspects.TC_AspectStack> aAspects) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, + List<TC_Aspects.TC_AspectStack> aAspects) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aTypes, - aR, - aG, - aB, - aA, - aName, - aDefaultLocalName, - aFuelType, - aFuelPower, - aMeltingPoint, - aBlastFurnaceTemp, - aBlastFurnaceRequired, - aTransparent, - aOreValue, - aDensityMultiplier, - aDensityDivider, - aColor); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aTypes, + aR, + aG, + aB, + aA, + aName, + aDefaultLocalName, + aFuelType, + aFuelPower, + aMeltingPoint, + aBlastFurnaceTemp, + aBlastFurnaceRequired, + aTransparent, + aOreValue, + aDensityMultiplier, + aDensityDivider, + aColor); mAspects.addAll(aAspects); } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, - Element aElement, List<TC_Aspects.TC_AspectStack> aAspects) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, Element aElement, + List<TC_Aspects.TC_AspectStack> aAspects) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aTypes, - aR, - aG, - aB, - aA, - aName, - aDefaultLocalName, - aFuelType, - aFuelPower, - aMeltingPoint, - aBlastFurnaceTemp, - aBlastFurnaceRequired, - aTransparent, - aOreValue, - aDensityMultiplier, - aDensityDivider, - aColor); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aTypes, + aR, + aG, + aB, + aA, + aName, + aDefaultLocalName, + aFuelType, + aFuelPower, + aMeltingPoint, + aBlastFurnaceTemp, + aBlastFurnaceRequired, + aTransparent, + aOreValue, + aDensityMultiplier, + aDensityDivider, + aColor); mElement = aElement; mElement.mLinkedMaterials.add(this); if (aElement == Element._NULL) { @@ -1267,74 +1266,74 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, - int aExtraData, List<MaterialStack> aMaterialList) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, int aExtraData, + List<MaterialStack> aMaterialList) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aTypes, - aR, - aG, - aB, - aA, - aName, - aDefaultLocalName, - aFuelType, - aFuelPower, - aMeltingPoint, - aBlastFurnaceTemp, - aBlastFurnaceRequired, - aTransparent, - aOreValue, - aDensityMultiplier, - aDensityDivider, - aColor, - aExtraData, - aMaterialList, - null); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aTypes, + aR, + aG, + aB, + aA, + aName, + aDefaultLocalName, + aFuelType, + aFuelPower, + aMeltingPoint, + aBlastFurnaceTemp, + aBlastFurnaceRequired, + aTransparent, + aOreValue, + aDensityMultiplier, + aDensityDivider, + aColor, + aExtraData, + aMaterialList, + null); } public Materials(int aMetaItemSubID, TextureSet aIconSet, float aToolSpeed, int aDurability, int aToolQuality, - int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, - int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, - boolean aTransparent, int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, - int aExtraData, List<MaterialStack> aMaterialList, List<TC_Aspects.TC_AspectStack> aAspects) { + int aTypes, int aR, int aG, int aB, int aA, String aName, String aDefaultLocalName, int aFuelType, + int aFuelPower, int aMeltingPoint, int aBlastFurnaceTemp, boolean aBlastFurnaceRequired, boolean aTransparent, + int aOreValue, int aDensityMultiplier, int aDensityDivider, Dyes aColor, int aExtraData, + List<MaterialStack> aMaterialList, List<TC_Aspects.TC_AspectStack> aAspects) { this( - aMetaItemSubID, - aIconSet, - aToolSpeed, - aDurability, - aToolQuality, - aTypes, - aR, - aG, - aB, - aA, - aName, - aDefaultLocalName, - aFuelType, - aFuelPower, - aMeltingPoint, - aBlastFurnaceTemp, - aBlastFurnaceRequired, - aTransparent, - aOreValue, - aDensityMultiplier, - aDensityDivider, - aColor); + aMetaItemSubID, + aIconSet, + aToolSpeed, + aDurability, + aToolQuality, + aTypes, + aR, + aG, + aB, + aA, + aName, + aDefaultLocalName, + aFuelType, + aFuelPower, + aMeltingPoint, + aBlastFurnaceTemp, + aBlastFurnaceRequired, + aTransparent, + aOreValue, + aDensityMultiplier, + aDensityDivider, + aColor); mExtraData = aExtraData; mMaterialList.addAll(aMaterialList); if (mMaterialList.size() == 1) mChemicalFormula = mMaterialList.get(0) - .toString(true); + .toString(true); else mChemicalFormula = mMaterialList.stream() - .map(MaterialStack::toString) - .collect(Collectors.joining()) - .replaceAll("_", "-"); + .map(MaterialStack::toString) + .collect(Collectors.joining()) + .replaceAll("_", "-"); int tAmountOfComponents = 0, tMeltingPoint = 0; for (MaterialStack tMaterial : mMaterialList) { @@ -1356,38 +1355,38 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void setSmeltingInto() { SamariumMagnetic.setSmeltingInto(Samarium) - .setMaceratingInto(Samarium) - .setArcSmeltingInto(Samarium); + .setMaceratingInto(Samarium) + .setArcSmeltingInto(Samarium); NeodymiumMagnetic.setSmeltingInto(Neodymium) - .setMaceratingInto(Neodymium) - .setArcSmeltingInto(Neodymium); + .setMaceratingInto(Neodymium) + .setArcSmeltingInto(Neodymium); SteelMagnetic.setSmeltingInto(Steel) - .setMaceratingInto(Steel) - .setArcSmeltingInto(Steel); + .setMaceratingInto(Steel) + .setArcSmeltingInto(Steel); Iron.setSmeltingInto(Iron) .setMaceratingInto(Iron) .setArcSmeltingInto(WroughtIron); AnyIron.setSmeltingInto(Iron) - .setMaceratingInto(Iron) - .setArcSmeltingInto(WroughtIron); + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); PigIron.setSmeltingInto(Iron) - .setMaceratingInto(Iron) - .setArcSmeltingInto(WroughtIron); + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); WroughtIron.setSmeltingInto(WroughtIron) - .setMaceratingInto(WroughtIron) - .setArcSmeltingInto(WroughtIron); + .setMaceratingInto(WroughtIron) + .setArcSmeltingInto(WroughtIron); IronMagnetic.setSmeltingInto(Iron) - .setMaceratingInto(Iron) - .setArcSmeltingInto(WroughtIron); + .setMaceratingInto(Iron) + .setArcSmeltingInto(WroughtIron); Copper.setSmeltingInto(Copper) - .setMaceratingInto(Copper) - .setArcSmeltingInto(AnnealedCopper); + .setMaceratingInto(Copper) + .setArcSmeltingInto(AnnealedCopper); AnyCopper.setSmeltingInto(Copper) - .setMaceratingInto(Copper) - .setArcSmeltingInto(AnnealedCopper); + .setMaceratingInto(Copper) + .setArcSmeltingInto(AnnealedCopper); AnnealedCopper.setSmeltingInto(AnnealedCopper) - .setMaceratingInto(AnnealedCopper) - .setArcSmeltingInto(AnnealedCopper); + .setMaceratingInto(AnnealedCopper) + .setArcSmeltingInto(AnnealedCopper); Netherrack.setSmeltingInto(NetherBrick); MeatRaw.setSmeltingInto(MeatCooked); Sand.setSmeltingInto(Glass); @@ -1403,28 +1402,28 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void setDirectSmelting() { Cinnabar.setDirectSmelting(Mercury) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.SMELTING_TO_GEM); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.SMELTING_TO_GEM); Tetrahedrite.setDirectSmelting(Copper) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); Chalcopyrite.setDirectSmelting(Copper) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT) + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); Malachite.setDirectSmelting(Copper) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); Pentlandite.setDirectSmelting(Nickel) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); Sphalerite.setDirectSmelting(Zinc) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); Pyrite.setDirectSmelting(Iron) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); BasalticMineralSand.setDirectSmelting(Iron) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); GraniticMineralSand.setDirectSmelting(Iron) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); YellowLimonite.setDirectSmelting(Iron) - .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); + .add(SubTag.INDUCTIONSMELTING_LOW_OUTPUT); BrownLimonite.setDirectSmelting(Iron); BandedIron.setDirectSmelting(Iron); Magnetite.setDirectSmelting(Iron); @@ -1435,9 +1434,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Cobaltite.setDirectSmelting(Cobalt); Stibnite.setDirectSmelting(Antimony); Cooperite.setDirectSmelting(Platinum) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); Molybdenite.setDirectSmelting(Molybdenum) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); Galena.setDirectSmelting(Lead); RoastedIron.setDirectSmelting(Iron); RoastedAntimony.setDirectSmelting(Antimony); @@ -1451,68 +1450,68 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void setMultipliers() { Amber.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedAir.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedFire.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedEarth.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedWater.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedEntropy.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedOrder.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedVis.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); InfusedDull.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); Salt.setOreMultiplier(2) .setSmeltingMultiplier(2); RockSalt.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); Scheelite.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); Tungstate.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); Cassiterite.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); CassiteriteSand.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); NetherQuartz.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); CertusQuartz.setOreMultiplier(2) - .setSmeltingMultiplier(2); + .setSmeltingMultiplier(2); TricalciumPhosphate.setOreMultiplier(3) - .setSmeltingMultiplier(3); + .setSmeltingMultiplier(3); Saltpeter.setOreMultiplier(4) - .setSmeltingMultiplier(4); + .setSmeltingMultiplier(4); Apatite.setOreMultiplier(4) - .setSmeltingMultiplier(4) - .setByProductMultiplier(2); + .setSmeltingMultiplier(4) + .setByProductMultiplier(2); Electrotine.setOreMultiplier(5) - .setSmeltingMultiplier(5); + .setSmeltingMultiplier(5); Teslatite.setOreMultiplier(5) - .setSmeltingMultiplier(5); + .setSmeltingMultiplier(5); Redstone.setOreMultiplier(5) - .setSmeltingMultiplier(5); + .setSmeltingMultiplier(5); Glowstone.setOreMultiplier(5) - .setSmeltingMultiplier(5); + .setSmeltingMultiplier(5); Lapis.setOreMultiplier(6) - .setSmeltingMultiplier(6) - .setByProductMultiplier(4); + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); Sodalite.setOreMultiplier(6) - .setSmeltingMultiplier(6) - .setByProductMultiplier(4); + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); Lazurite.setOreMultiplier(6) - .setSmeltingMultiplier(6) - .setByProductMultiplier(4); + .setSmeltingMultiplier(6) + .setByProductMultiplier(4); Monazite.setOreMultiplier(8) - .setSmeltingMultiplier(8) - .setByProductMultiplier(2); + .setSmeltingMultiplier(8) + .setByProductMultiplier(2); Cryolite.setOreMultiplier(4) - .setByProductMultiplier(4); + .setByProductMultiplier(4); } private static void setEnchantmentKnockbackTools() { @@ -1702,7 +1701,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Lepidolite.addOreByProducts(Lithium, Caesium); Andradite.addOreByProducts(GarnetYellow, Iron); Pyrolusite.addOreByProducts(Manganese, Tantalite, Niobium) - .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); + .add(SubTag.DONT_ADD_DEFAULT_BBF_RECIPE); TricalciumPhosphate.addOreByProducts(Apatite, Phosphate, Pyrochlore); Apatite.addOreByProducts(TricalciumPhosphate, Phosphate, Pyrochlore); Pyrochlore.addOreByProducts(Apatite, Calcite, Niobium); @@ -1910,39 +1909,31 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void initSubTags() { SubTag.ELECTROMAGNETIC_SEPERATION_NEODYMIUM.addTo(Bastnasite, Monazite, Forcicium, Forcillium); - SubTag.ELECTROMAGNETIC_SEPERATION_GOLD.addTo( - Magnetite, - VanadiumMagnetite, - BasalticMineralSand, - GraniticMineralSand); + SubTag.ELECTROMAGNETIC_SEPERATION_GOLD + .addTo(Magnetite, VanadiumMagnetite, BasalticMineralSand, GraniticMineralSand); SubTag.NO_RECIPES.addTo(MagnetohydrodynamicallyConstrainedStarMatter); SubTag.ELECTROMAGNETIC_SEPERATION_IRON.addTo( - YellowLimonite, - BrownLimonite, - Pyrite, - BandedIron, - Nickel, - Vermiculite, - Glauconite, - GlauconiteSand, - Pentlandite, - Tin, - Antimony, - Ilmenite, - Manganese, - Chrome, - Chromite, - Andradite); - - SubTag.BLASTFURNACE_CALCITE_DOUBLE.addTo( - Pyrite, - BrownLimonite, - YellowLimonite, - BasalticMineralSand, - GraniticMineralSand, - Magnetite); + YellowLimonite, + BrownLimonite, + Pyrite, + BandedIron, + Nickel, + Vermiculite, + Glauconite, + GlauconiteSand, + Pentlandite, + Tin, + Antimony, + Ilmenite, + Manganese, + Chrome, + Chromite, + Andradite); + + SubTag.BLASTFURNACE_CALCITE_DOUBLE + .addTo(Pyrite, BrownLimonite, YellowLimonite, BasalticMineralSand, GraniticMineralSand, Magnetite); SubTag.BLASTFURNACE_CALCITE_TRIPLE.addTo(Iron, PigIron, DeepIron, ShadowIron, WroughtIron, MeteoricIron); @@ -1952,259 +1943,259 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { SubTag.WASHING_SODIUMPERSULFATE.addTo(Zinc, Nickel, Copper, Cobalt, Cobaltite, Tetrahedrite); SubTag.METAL.addTo( - AnyIron, - AnyCopper, - AnyBronze, - Metal, - Aluminium, - Americium, - Antimony, - Beryllium, - Bismuth, - Caesium, - Cerium, - Chrome, - Cobalt, - Copper, - Dysprosium, - Erbium, - Europium, - Gadolinium, - Gallium, - Gold, - Holmium, - Indium, - Iridium, - Iron, - Lanthanum, - Lead, - Lutetium, - Magnesium, - Manganese, - Mercury, - Niobium, - Molybdenum, - Neodymium, - Neutronium, - Nickel, - Osmium, - Palladium, - Platinum, - Plutonium, - Plutonium241, - Praseodymium, - Promethium, - Rubidium, - Samarium, - Scandium, - Silicon, - Silver, - Tantalum, - Tellurium, - Terbium, - Thorium, - Thulium, - Tin, - Titanium, - Tungsten, - Uranium, - Uranium235, - Vanadium, - Ytterbium, - Yttrium, - Zinc, - Flerovium, - PhasedIron, - PhasedGold, - DarkSteel, - TinAlloy, - ConductiveIron, - ElectricalSteel, - EnergeticAlloy, - VibrantAlloy, - MelodicAlloy, - StellarAlloy, - VividAlloy, - EnergeticSilver, - CrystallinePinkSlime, - CrystallineAlloy, - CrudeSteel, - EndSteel, - PulsatingIron, - DarkThaumium, - Adamantium, - Amordrine, - Angmallen, - Ardite, - Aredrite, - Atlarus, - Carmot, - Celenegil, - Ceruclase, - DarkIron, - Desh, - Desichalkos, - Duranium, - ElectrumFlux, - Enderium, - EnderiumBase, - Eximite, - FierySteel, - Force, - Haderoth, - Hematite, - Hepatizon, - HSLA, - Infuscolium, - InfusedGold, - Inolashite, - Mercassium, - MeteoricIron, - BloodInfusedIron, - Universium, - MagnetohydrodynamicallyConstrainedStarMatter, - MeteoricSteel, - Naquadah, - NaquadahAlloy, - NaquadahEnriched, - Naquadria, - ObsidianFlux, - Orichalcum, - Osmonium, - Oureclase, - Phoenixite, - Prometheum, - Sanguinite, - CosmicNeutronium, - Tartarite, - Ichorium, - Tritanium, - Vulcanite, - Vyroxeres, - Yellorium, - Zectium, - AluminiumBrass, - Osmiridium, - Sunnarium, - AnnealedCopper, - BatteryAlloy, - Brass, - Bronze, - ChromiumDioxide, - Cupronickel, - DeepIron, - Electrum, - Invar, - Kanthal, - Magnalium, - Nichrome, - NiobiumNitride, - NiobiumTitanium, - PigIron, - SolderingAlloy, - StainlessSteel, - Steel, - Ultimet, - VanadiumGallium, - WroughtIron, - YttriumBariumCuprate, - IronWood, - Alumite, - Manyullyn, - ShadowIron, - Shadow, - ShadowSteel, - Steeleaf, - SterlingSilver, - RoseGold, - BlackBronze, - BismuthBronze, - BlackSteel, - RedSteel, - BlueSteel, - DamascusSteel, - TungstenSteel, - TPV, - AstralSilver, - Mithril, - BlueAlloy, - RedAlloy, - CobaltBrass, - Thaumium, - Void, - IronMagnetic, - SteelMagnetic, - NeodymiumMagnetic, - SamariumMagnetic, - Knightmetal, - HSSG, - HSSE, - HSSS, - TungstenCarbide, - HeeEndium, - VanadiumSteel, - Kalendrite, - Ignatius, - Trinium, - Infinity, - InfinityCatalyst, - Realgar, - Chrysotile, - BlackPlutonium, - Alduorite, - Adluorite, - Vinteum, - Rubracium, - Draconium, - DraconiumAwakened, - Pentacadmiummagnesiumhexaoxid, - Titaniumonabariumdecacoppereikosaoxid, - Uraniumtriplatinid, - Vanadiumtriindinid, - Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, - Tetranaquadahdiindiumhexaplatiumosminid, - Longasssuperconductornameforuvwire, - Longasssuperconductornameforuhvwire, - SuperconductorUEVBase, - SuperconductorUIVBase, - SuperconductorUMVBase, - Quantium, - RedstoneAlloy, - Bedrockium, - EnrichedHolmium); + AnyIron, + AnyCopper, + AnyBronze, + Metal, + Aluminium, + Americium, + Antimony, + Beryllium, + Bismuth, + Caesium, + Cerium, + Chrome, + Cobalt, + Copper, + Dysprosium, + Erbium, + Europium, + Gadolinium, + Gallium, + Gold, + Holmium, + Indium, + Iridium, + Iron, + Lanthanum, + Lead, + Lutetium, + Magnesium, + Manganese, + Mercury, + Niobium, + Molybdenum, + Neodymium, + Neutronium, + Nickel, + Osmium, + Palladium, + Platinum, + Plutonium, + Plutonium241, + Praseodymium, + Promethium, + Rubidium, + Samarium, + Scandium, + Silicon, + Silver, + Tantalum, + Tellurium, + Terbium, + Thorium, + Thulium, + Tin, + Titanium, + Tungsten, + Uranium, + Uranium235, + Vanadium, + Ytterbium, + Yttrium, + Zinc, + Flerovium, + PhasedIron, + PhasedGold, + DarkSteel, + TinAlloy, + ConductiveIron, + ElectricalSteel, + EnergeticAlloy, + VibrantAlloy, + MelodicAlloy, + StellarAlloy, + VividAlloy, + EnergeticSilver, + CrystallinePinkSlime, + CrystallineAlloy, + CrudeSteel, + EndSteel, + PulsatingIron, + DarkThaumium, + Adamantium, + Amordrine, + Angmallen, + Ardite, + Aredrite, + Atlarus, + Carmot, + Celenegil, + Ceruclase, + DarkIron, + Desh, + Desichalkos, + Duranium, + ElectrumFlux, + Enderium, + EnderiumBase, + Eximite, + FierySteel, + Force, + Haderoth, + Hematite, + Hepatizon, + HSLA, + Infuscolium, + InfusedGold, + Inolashite, + Mercassium, + MeteoricIron, + BloodInfusedIron, + Universium, + MagnetohydrodynamicallyConstrainedStarMatter, + MeteoricSteel, + Naquadah, + NaquadahAlloy, + NaquadahEnriched, + Naquadria, + ObsidianFlux, + Orichalcum, + Osmonium, + Oureclase, + Phoenixite, + Prometheum, + Sanguinite, + CosmicNeutronium, + Tartarite, + Ichorium, + Tritanium, + Vulcanite, + Vyroxeres, + Yellorium, + Zectium, + AluminiumBrass, + Osmiridium, + Sunnarium, + AnnealedCopper, + BatteryAlloy, + Brass, + Bronze, + ChromiumDioxide, + Cupronickel, + DeepIron, + Electrum, + Invar, + Kanthal, + Magnalium, + Nichrome, + NiobiumNitride, + NiobiumTitanium, + PigIron, + SolderingAlloy, + StainlessSteel, + Steel, + Ultimet, + VanadiumGallium, + WroughtIron, + YttriumBariumCuprate, + IronWood, + Alumite, + Manyullyn, + ShadowIron, + Shadow, + ShadowSteel, + Steeleaf, + SterlingSilver, + RoseGold, + BlackBronze, + BismuthBronze, + BlackSteel, + RedSteel, + BlueSteel, + DamascusSteel, + TungstenSteel, + TPV, + AstralSilver, + Mithril, + BlueAlloy, + RedAlloy, + CobaltBrass, + Thaumium, + Void, + IronMagnetic, + SteelMagnetic, + NeodymiumMagnetic, + SamariumMagnetic, + Knightmetal, + HSSG, + HSSE, + HSSS, + TungstenCarbide, + HeeEndium, + VanadiumSteel, + Kalendrite, + Ignatius, + Trinium, + Infinity, + InfinityCatalyst, + Realgar, + Chrysotile, + BlackPlutonium, + Alduorite, + Adluorite, + Vinteum, + Rubracium, + Draconium, + DraconiumAwakened, + Pentacadmiummagnesiumhexaoxid, + Titaniumonabariumdecacoppereikosaoxid, + Uraniumtriplatinid, + Vanadiumtriindinid, + Tetraindiumditindibariumtitaniumheptacoppertetrakaidekaoxid, + Tetranaquadahdiindiumhexaplatiumosminid, + Longasssuperconductornameforuvwire, + Longasssuperconductornameforuhvwire, + SuperconductorUEVBase, + SuperconductorUIVBase, + SuperconductorUMVBase, + Quantium, + RedstoneAlloy, + Bedrockium, + EnrichedHolmium); SubTag.FOOD.addTo( - MeatRaw, - MeatCooked, - Ice, - Water, - Salt, - Chili, - Cocoa, - Cheese, - Coffee, - Chocolate, - Milk, - Honey, - FryingOilHot, - FishOil, - SeedOil, - SeedOilLin, - SeedOilHemp, - Wheat, - Sugar, - FreshWater); + MeatRaw, + MeatCooked, + Ice, + Water, + Salt, + Chili, + Cocoa, + Cheese, + Coffee, + Chocolate, + Milk, + Honey, + FryingOilHot, + FishOil, + SeedOil, + SeedOilLin, + SeedOilHemp, + Wheat, + Sugar, + FreshWater); Wood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); WoodSealed.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING, SubTag.NO_WORKING); Peanutwood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.NO_SMELTING, SubTag.NO_SMASHING); LiveRoot.add( - SubTag.WOOD, - SubTag.FLAMMABLE, - SubTag.NO_SMELTING, - SubTag.NO_SMASHING, - SubTag.MAGICAL, - SubTag.MORTAR_GRINDABLE); + SubTag.WOOD, + SubTag.FLAMMABLE, + SubTag.NO_SMELTING, + SubTag.NO_SMASHING, + SubTag.MAGICAL, + SubTag.MORTAR_GRINDABLE); IronWood.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.MAGICAL, SubTag.MORTAR_GRINDABLE); Steeleaf.add(SubTag.WOOD, SubTag.FLAMMABLE, SubTag.MAGICAL, SubTag.MORTAR_GRINDABLE, SubTag.NO_SMELTING); @@ -2248,11 +2239,11 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { ConstructionFoam.add(SubTag.STONE, SubTag.NO_SMASHING, SubTag.EXPLOSIVE, SubTag.NO_SMELTING); ReinforceGlass.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.SMELTING_TO_FLUID); Redstone.add( - SubTag.STONE, - SubTag.NO_SMASHING, - SubTag.UNBURNABLE, - SubTag.SMELTING_TO_FLUID, - SubTag.PULVERIZING_CINNABAR); + SubTag.STONE, + SubTag.NO_SMASHING, + SubTag.UNBURNABLE, + SubTag.SMELTING_TO_FLUID, + SubTag.PULVERIZING_CINNABAR); Glowstone.add(SubTag.STONE, SubTag.NO_SMASHING, SubTag.UNBURNABLE, SubTag.SMELTING_TO_FLUID); Electrotine.add(SubTag.STONE, SubTag.NO_SMASHING, SubTag.UNBURNABLE, SubTag.SMELTING_TO_FLUID); Teslatite.add(SubTag.STONE, SubTag.NO_SMASHING, SubTag.UNBURNABLE, SubTag.SMELTING_TO_FLUID); @@ -2320,22 +2311,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { Monazite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE); Quartzite.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Quartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - SiliconDioxide.add( - SubTag.CRYSTAL, - SubTag.NO_SMASHING, - SubTag.NO_SMELTING, - SubTag.CRYSTALLISABLE, - SubTag.QUARTZ); + SiliconDioxide + .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Dilithium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); NetherQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); CertusQuartz.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); Fluix.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.QUARTZ); - TricalciumPhosphate.add( - SubTag.CRYSTAL, - SubTag.NO_SMASHING, - SubTag.NO_SMELTING, - SubTag.FLAMMABLE, - SubTag.EXPLOSIVE); + TricalciumPhosphate + .add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); Phosphate.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.FLAMMABLE, SubTag.EXPLOSIVE); InfusedAir.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); InfusedFire.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.UNBURNABLE); @@ -2349,14 +2332,14 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { EnderPearl.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.PEARL); EnderEye.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.MAGICAL, SubTag.PEARL); Firestone.add( - SubTag.CRYSTAL, - SubTag.NO_SMASHING, - SubTag.NO_SMELTING, - SubTag.CRYSTALLISABLE, - SubTag.MAGICAL, - SubTag.QUARTZ, - SubTag.UNBURNABLE, - SubTag.BURNING); + SubTag.CRYSTAL, + SubTag.NO_SMASHING, + SubTag.NO_SMELTING, + SubTag.CRYSTALLISABLE, + SubTag.MAGICAL, + SubTag.QUARTZ, + SubTag.UNBURNABLE, + SubTag.BURNING); Forcicium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.MAGICAL); Forcillium.add(SubTag.CRYSTAL, SubTag.NO_SMASHING, SubTag.NO_SMELTING, SubTag.CRYSTALLISABLE, SubTag.MAGICAL); Force.add(SubTag.CRYSTAL, SubTag.MAGICAL, SubTag.UNBURNABLE); @@ -2402,18 +2385,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { // materials initMaterialProperties(); // No more material addition or manipulation should be done past this point! MATERIALS_ARRAY = MATERIALS_MAP.values() - .toArray(new Materials[0]); // Generate standard object array. This is a - // lot faster to loop over. + .toArray(new Materials[0]); // Generate standard object array. This is a + // lot faster to loop over. VALUES = Arrays.asList(MATERIALS_ARRAY); if (!NewHorizonsCoreMod.isModLoaded() && !GT_Mod.gregtechproxy.mEnableAllComponents) OrePrefixes.initMaterialComponents(); else { OrePrefixes.ingotHot.mDisabledItems.addAll( - Arrays.stream(Materials.values()) - .parallel() - .filter(OrePrefixes.ingotHot::doGenerateItem) - .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes) - .collect(Collectors.toSet())); + Arrays.stream(Materials.values()) + .parallel() + .filter(OrePrefixes.ingotHot::doGenerateItem) + .filter(m -> m.mBlastFurnaceTemp < 1750 && m.mAutoGenerateBlastFurnaceRecipes) + .collect(Collectors.toSet())); OrePrefixes.ingotHot.disableComponent(Materials.Reinforced); OrePrefixes.ingotHot.disableComponent(Materials.ConductiveIron); OrePrefixes.ingotHot.disableComponent(Materials.FierySteel); @@ -2455,16 +2438,16 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { if (GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] == null) { GregTech_API.sGeneratedMaterials[aMaterial.mMetaItemSubID] = aMaterial; } else throw new IllegalArgumentException( - "The Material Index " + aMaterial.mMetaItemSubID - + " for " - + aMaterial.mName - + " is already used!"); - } - } else throw new IllegalArgumentException( - "The Material Index " + aMaterial.mMetaItemSubID + "The Material Index " + aMaterial.mMetaItemSubID + " for " + aMaterial.mName - + " is/over the maximum of 1000"); + + " is already used!"); + } + } else throw new IllegalArgumentException( + "The Material Index " + aMaterial.mMetaItemSubID + + " for " + + aMaterial.mName + + " is/over the maximum of 1000"); } } } @@ -2475,60 +2458,40 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addTemperatureValues(Materials aMaterial, String aConfigPath) { - aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties.get( - aConfigPath, - "MeltingPoint", - aMaterial.mMeltingPoint); - aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties.get( - aConfigPath, - "BlastFurnaceRequired", - aMaterial.mBlastFurnaceRequired); - aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties.get( - aConfigPath, - "BlastFurnaceTemp", - aMaterial.mBlastFurnaceTemp); + aMaterial.mMeltingPoint = GregTech_API.sMaterialProperties + .get(aConfigPath, "MeltingPoint", aMaterial.mMeltingPoint); + aMaterial.mBlastFurnaceRequired = GregTech_API.sMaterialProperties + .get(aConfigPath, "BlastFurnaceRequired", aMaterial.mBlastFurnaceRequired); + aMaterial.mBlastFurnaceTemp = (short) GregTech_API.sMaterialProperties + .get(aConfigPath, "BlastFurnaceTemp", aMaterial.mBlastFurnaceTemp); aMaterial.mGasTemp = GregTech_API.sMaterialProperties.get(aConfigPath, "GasTemp", aMaterial.mGasTemp); aMaterial.setHeatDamage( - (float) GregTech_API.sMaterialProperties.get(aConfigPath, "HeatDamage", aMaterial.mHeatDamage)); + (float) GregTech_API.sMaterialProperties.get(aConfigPath, "HeatDamage", aMaterial.mHeatDamage)); } private static void addDensityValues(Materials aMaterial, String aConfigPath) { - aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties.get( - aConfigPath, - "DensityMultiplier", - aMaterial.mDensityMultiplier); - aMaterial.mDensityDivider = GregTech_API.sMaterialProperties.get( - aConfigPath, - "DensityDivider", - aMaterial.mDensityDivider); + aMaterial.mDensityMultiplier = GregTech_API.sMaterialProperties + .get(aConfigPath, "DensityMultiplier", aMaterial.mDensityMultiplier); + aMaterial.mDensityDivider = GregTech_API.sMaterialProperties + .get(aConfigPath, "DensityDivider", aMaterial.mDensityDivider); aMaterial.mDensity = (long) GregTech_API.sMaterialProperties.get( - aConfigPath, - "Density", - ((double) M * aMaterial.mDensityMultiplier) - / (aMaterial.mDensityDivider != 0 ? aMaterial.mDensityDivider : 1)); + aConfigPath, + "Density", + ((double) M * aMaterial.mDensityMultiplier) + / (aMaterial.mDensityDivider != 0 ? aMaterial.mDensityDivider : 1)); } private static void addColorValues(Materials aMaterial, String aConfigPath) { - aMaterial.mTransparent = GregTech_API.sMaterialProperties.get( - aConfigPath, - "Transparent", - aMaterial.mTransparent); - String aColor = GregTech_API.sMaterialProperties.get( - aConfigPath, - "DyeColor", - aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString()); + aMaterial.mTransparent = GregTech_API.sMaterialProperties + .get(aConfigPath, "Transparent", aMaterial.mTransparent); + String aColor = GregTech_API.sMaterialProperties + .get(aConfigPath, "DyeColor", aMaterial.mColor == Dyes._NULL ? "None" : aMaterial.mColor.toString()); aMaterial.mColor = aColor.equals("None") ? Dyes._NULL : Dyes.get(aColor); String[] aRGBA = GregTech_API.sMaterialProperties.get( - aConfigPath, - "MatRGBA", - aMaterial.mRGBa[0] + "," - + aMaterial.mRGBa[1] - + "," - + aMaterial.mRGBa[2] - + "," - + aMaterial.mRGBa[3] - + ",") - .split(","); + aConfigPath, + "MatRGBA", + aMaterial.mRGBa[0] + "," + aMaterial.mRGBa[1] + "," + aMaterial.mRGBa[2] + "," + aMaterial.mRGBa[3] + ",") + .split(","); aMaterial.mRGBa[0] = Short.parseShort(aRGBA[0]); aMaterial.mRGBa[1] = Short.parseShort(aRGBA[1]); aMaterial.mRGBa[2] = Short.parseShort(aRGBA[2]); @@ -2536,26 +2499,20 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addToolValues(Materials aMaterial, String aConfigPath) { - aMaterial.mDurability = GregTech_API.sMaterialProperties.get( - aConfigPath, - "ToolDurability", - aMaterial.mDurability); - aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties.get( - aConfigPath, - "ToolSpeed", - aMaterial.mToolSpeed); - aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties.get( - aConfigPath, - "ToolQuality", - aMaterial.mToolQuality); + aMaterial.mDurability = GregTech_API.sMaterialProperties + .get(aConfigPath, "ToolDurability", aMaterial.mDurability); + aMaterial.mToolSpeed = (float) GregTech_API.sMaterialProperties + .get(aConfigPath, "ToolSpeed", aMaterial.mToolSpeed); + aMaterial.mToolQuality = (byte) GregTech_API.sMaterialProperties + .get(aConfigPath, "ToolQuality", aMaterial.mToolQuality); // Moved from GT_Proxy? (Not sure) aMaterial.mHandleMaterial = (aMaterial == Desh ? aMaterial.mHandleMaterial - : aMaterial == Diamond || aMaterial == Thaumium ? Wood - : aMaterial.contains(SubTag.BURNING) ? Blaze - : aMaterial.contains(SubTag.MAGICAL) && aMaterial.contains(SubTag.CRYSTAL) - && Thaumcraft.isModLoaded() ? Thaumium - : aMaterial.getMass() > Element.Tc.getMass() * 2 ? TungstenSteel - : aMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood); + : aMaterial == Diamond || aMaterial == Thaumium ? Wood + : aMaterial.contains(SubTag.BURNING) ? Blaze + : aMaterial.contains(SubTag.MAGICAL) && aMaterial.contains(SubTag.CRYSTAL) + && Thaumcraft.isModLoaded() ? Thaumium + : aMaterial.getMass() > Element.Tc.getMass() * 2 ? TungstenSteel + : aMaterial.getMass() > Element.Tc.getMass() ? Steel : Wood); if (aMaterial == Materials.SpaceTime) { aMaterial.mHandleMaterial = Materials.Infinity; @@ -2567,58 +2524,41 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } private static void addEnchantmentValues(Materials aMaterial, String aConfigPath) { - aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties.get( - aConfigPath, - "EnchantmentLevel", - aMaterial.mEnchantmentToolsLevel); + aMaterial.mEnchantmentToolsLevel = (byte) GregTech_API.sMaterialProperties + .get(aConfigPath, "EnchantmentLevel", aMaterial.mEnchantmentToolsLevel); String aEnchantmentName = GregTech_API.sMaterialProperties.get( - aConfigPath, - "Enchantment", - aMaterial.mEnchantmentTools != null ? aMaterial.mEnchantmentTools.getName() : ""); + aConfigPath, + "Enchantment", + aMaterial.mEnchantmentTools != null ? aMaterial.mEnchantmentTools.getName() : ""); if (aMaterial.mEnchantmentTools != null && !aEnchantmentName.equals(aMaterial.mEnchantmentTools.getName())) IntStream.range(0, Enchantment.enchantmentsList.length) - .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName())) - .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]); + .filter(i -> aEnchantmentName.equals(Enchantment.enchantmentsList[i].getName())) + .forEach(i -> aMaterial.mEnchantmentTools = Enchantment.enchantmentsList[i]); } private static void addProcessingIntoValues(Materials aMaterial, String aConfigPath) { - aMaterial.mSmeltInto = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialSmeltInto", aMaterial.mSmeltInto.mName)); + aMaterial.mSmeltInto = MATERIALS_MAP + .get(GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialSmeltInto", aMaterial.mSmeltInto.mName)); aMaterial.mMacerateInto = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties.get( - aConfigPath, - "MaterialMacerateInto", - aMaterial.mMacerateInto.mName)); + GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialMacerateInto", aMaterial.mMacerateInto.mName)); aMaterial.mArcSmeltInto = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties.get( - aConfigPath, - "MaterialArcSmeltInto", - aMaterial.mArcSmeltInto.mName)); + GregTech_API.sMaterialProperties.get(aConfigPath, "MaterialArcSmeltInto", aMaterial.mArcSmeltInto.mName)); aMaterial.mDirectSmelting = MATERIALS_MAP.get( - GregTech_API.sMaterialProperties.get( - aConfigPath, - "MaterialDirectSmeltInto", - aMaterial.mDirectSmelting.mName)); - aMaterial.mAutoGenerateBlastFurnaceRecipes = GregTech_API.sMaterialProperties.get( - aConfigPath, - "AutoGenerateBlastFurnaceRecipes", - aMaterial.mAutoGenerateBlastFurnaceRecipes); + GregTech_API.sMaterialProperties + .get(aConfigPath, "MaterialDirectSmeltInto", aMaterial.mDirectSmelting.mName)); + aMaterial.mAutoGenerateBlastFurnaceRecipes = GregTech_API.sMaterialProperties + .get(aConfigPath, "AutoGenerateBlastFurnaceRecipes", aMaterial.mAutoGenerateBlastFurnaceRecipes); } private static void addMultiplierValues(Materials aMaterial, String aConfigPath) { aMaterial.mOreValue = GregTech_API.sMaterialProperties.get(aConfigPath, "OreValue", aMaterial.mOreValue); aMaterial.setOreMultiplier( - GregTech_API.sMaterialProperties.get(aConfigPath, "OreMultiplier", aMaterial.mOreMultiplier)); + GregTech_API.sMaterialProperties.get(aConfigPath, "OreMultiplier", aMaterial.mOreMultiplier)); aMaterial.setSmeltingMultiplier( - GregTech_API.sMaterialProperties.get( - aConfigPath, - "OreSmeltingMultiplier", - aMaterial.mSmeltingMultiplier)); + GregTech_API.sMaterialProperties.get(aConfigPath, "OreSmeltingMultiplier", aMaterial.mSmeltingMultiplier)); aMaterial.setByProductMultiplier( - GregTech_API.sMaterialProperties.get( - aConfigPath, - "OreByProductMultiplier", - aMaterial.mByProductMultiplier)); + GregTech_API.sMaterialProperties + .get(aConfigPath, "OreByProductMultiplier", aMaterial.mByProductMultiplier)); } private static void addHasGasFluid(Materials aMaterial, String aConfigPath) { @@ -2630,44 +2570,32 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { } aMaterial.mHasGas = GregTech_API.sMaterialProperties.get(aConfigPath, "AddGas", aMaterial.mHasGas); if (aMaterial.mHasGas) { - GT_FluidFactory.of( - aMaterial.mName.toLowerCase(), - aMaterial.mDefaultLocalName, - aMaterial, - GAS, - aMaterial.mGasTemp); + GT_FluidFactory + .of(aMaterial.mName.toLowerCase(), aMaterial.mDefaultLocalName, aMaterial, GAS, aMaterial.mGasTemp); } } } private static void addInternalStuff(Materials aMaterial, String aConfigPath) { - aMaterial.mMetaItemSubID = GregTech_API.sMaterialProperties.get( - aConfigPath, - "MaterialID", - aMaterial.mCustomOre ? -1 : aMaterial.mMetaItemSubID); + aMaterial.mMetaItemSubID = GregTech_API.sMaterialProperties + .get(aConfigPath, "MaterialID", aMaterial.mCustomOre ? -1 : aMaterial.mMetaItemSubID); aMaterial.mTypes = GregTech_API.sMaterialProperties.get( - aConfigPath, - "MaterialTypes", - aMaterial.mCustomOre ? 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 : aMaterial.mTypes); - aMaterial.mUnificatable = GregTech_API.sMaterialProperties.get( - aConfigPath, - "Unificatable", - aMaterial.mUnificatable); - aMaterial.mHasParentMod = GregTech_API.sMaterialProperties.get( - aConfigPath, - "HasParentMod", - aMaterial.mHasParentMod); + aConfigPath, + "MaterialTypes", + aMaterial.mCustomOre ? 1 | 2 | 4 | 8 | 16 | 32 | 64 | 128 : aMaterial.mTypes); + aMaterial.mUnificatable = GregTech_API.sMaterialProperties + .get(aConfigPath, "Unificatable", aMaterial.mUnificatable); + aMaterial.mHasParentMod = GregTech_API.sMaterialProperties + .get(aConfigPath, "HasParentMod", aMaterial.mHasParentMod); } private static void addLocalisation(Materials aMaterial, String aConfigPath) { aMaterial.mDefaultLocalName = GregTech_API.sMaterialProperties.get( - aConfigPath, - "MaterialName", - aMaterial.mCustomOre ? "CustomOre" + aMaterial.mCustomID : aMaterial.mDefaultLocalName); - aMaterial.mChemicalFormula = GregTech_API.sMaterialProperties.get( - aConfigPath, - "ChemicalFormula", - aMaterial.mChemicalFormula); + aConfigPath, + "MaterialName", + aMaterial.mCustomOre ? "CustomOre" + aMaterial.mCustomID : aMaterial.mDefaultLocalName); + aMaterial.mChemicalFormula = GregTech_API.sMaterialProperties + .get(aConfigPath, "ChemicalFormula", aMaterial.mChemicalFormula); } private static String getConfigPath(Materials aMaterial) { @@ -2678,27 +2606,20 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void addHarvestLevelNerfs(Materials aMaterial, String aConfigPath) { /* Moved the harvest level changes from GT_Mod to have fewer things iterating over MATERIALS_ARRAY */ if (GT_Mod.gregtechproxy.mChangeHarvestLevels && aMaterial.mToolQuality > 0 - && aMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length - && aMaterial.mMetaItemSubID >= 0) { - GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties.get( - aConfigPath, - "HarvestLevel", - aMaterial.mToolQuality); + && aMaterial.mMetaItemSubID < GT_Mod.gregtechproxy.mHarvestLevel.length + && aMaterial.mMetaItemSubID >= 0) { + GT_Mod.gregtechproxy.mHarvestLevel[aMaterial.mMetaItemSubID] = GregTech_API.sMaterialProperties + .get(aConfigPath, "HarvestLevel", aMaterial.mToolQuality); } } private static void addHarvestLevels() { - GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties.get( - "harvestlevel", - "ActivateHarvestLevelChange", - false); - GT_Mod.gregtechproxy.mMaxHarvestLevel = Math.min( - 15, - GregTech_API.sMaterialProperties.get("harvestlevel", "MaxHarvestLevel", 7)); - GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties.get( - "harvestlevel", - "GraniteHarvestLevel", - 3); + GT_Mod.gregtechproxy.mChangeHarvestLevels = GregTech_API.sMaterialProperties + .get("harvestlevel", "ActivateHarvestLevelChange", false); + GT_Mod.gregtechproxy.mMaxHarvestLevel = Math + .min(15, GregTech_API.sMaterialProperties.get("harvestlevel", "MaxHarvestLevel", 7)); + GT_Mod.gregtechproxy.mGraniteHavestLevel = GregTech_API.sMaterialProperties + .get("harvestlevel", "GraniteHarvestLevel", 3); } public static void initMaterialProperties() { @@ -2731,23 +2652,19 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void aspectCalculation(Materials aMaterial, String aConfigPath) { String aDefaultAspectString = aMaterial.mAspects.stream() - .map(aAspectStack -> aAspectStack.mAspect.toString()) - .collect(Collectors.joining(",", ",", "")); + .map(aAspectStack -> aAspectStack.mAspect.toString()) + .collect(Collectors.joining(",", ",", "")); String aDefaultAspectAmountString = aMaterial.mAspects.stream() - .map(aAspectStack -> String.valueOf(aAspectStack.mAmount)) - .collect(Collectors.joining(",", ",", "")); - - String aConfigAspectString = GregTech_API.sMaterialProperties.get( - aConfigPath, - "ListTCAspects", - aDefaultAspectString); - String aConfigAspectAmountString = GregTech_API.sMaterialProperties.get( - aConfigPath, - "ListTCAspectAmounts", - aDefaultAspectAmountString); + .map(aAspectStack -> String.valueOf(aAspectStack.mAmount)) + .collect(Collectors.joining(",", ",", "")); + + String aConfigAspectString = GregTech_API.sMaterialProperties + .get(aConfigPath, "ListTCAspects", aDefaultAspectString); + String aConfigAspectAmountString = GregTech_API.sMaterialProperties + .get(aConfigPath, "ListTCAspectAmounts", aDefaultAspectAmountString); if (!aConfigAspectString.equals(aDefaultAspectString) - || !aConfigAspectAmountString.equals(aDefaultAspectAmountString)) { + || !aConfigAspectAmountString.equals(aDefaultAspectAmountString)) { aMaterial.mAspects.clear(); if (aConfigAspectString.length() > 0) { String[] aAspects = aConfigAspectString.split(","); @@ -2764,38 +2681,34 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { private static void OreReRegistrationsCalculation(Materials aMaterial, String aConfigPath) { String aDefaultMatReRegString = aMaterial.mOreReRegistrations.stream() - .map(aTag -> aTag.mName) - .collect(Collectors.joining(",", ",", "")); - String aConfigMatMatReRegString = GregTech_API.sMaterialProperties.get( - aConfigPath, - "ListMaterialReRegistrations", - aDefaultMatReRegString); + .map(aTag -> aTag.mName) + .collect(Collectors.joining(",", ",", "")); + String aConfigMatMatReRegString = GregTech_API.sMaterialProperties + .get(aConfigPath, "ListMaterialReRegistrations", aDefaultMatReRegString); if (!aConfigMatMatReRegString.equals(aDefaultMatReRegString)) { aMaterial.mOreReRegistrations.clear(); if (aConfigMatMatReRegString.length() > 0) { Arrays.stream(aConfigMatMatReRegString.split(",")) - .map(MATERIALS_MAP::get) - .filter(Objects::nonNull) - .forEach(aMat -> aMaterial.mOreReRegistrations.add(aMat)); + .map(MATERIALS_MAP::get) + .filter(Objects::nonNull) + .forEach(aMat -> aMaterial.mOreReRegistrations.add(aMat)); } } } private static void OreByProductsCalculation(Materials aMaterial, String aConfigPath) { String aDefaultMatByProString = aMaterial.mOreByProducts.stream() - .map(aTag -> aTag.mName) - .collect(Collectors.joining(",", ",", "")); - String aConfigMatByProString = GregTech_API.sMaterialProperties.get( - aConfigPath, - "ListMaterialByProducts", - aDefaultMatByProString); + .map(aTag -> aTag.mName) + .collect(Collectors.joining(",", ",", "")); + String aConfigMatByProString = GregTech_API.sMaterialProperties + .get(aConfigPath, "ListMaterialByProducts", aDefaultMatByProString); if (!aConfigMatByProString.equals(aDefaultMatByProString)) { aMaterial.mOreByProducts.clear(); if (aConfigMatByProString.length() > 0) { Arrays.stream(aConfigMatByProString.split(",")) - .map(MATERIALS_MAP::get) - .filter(Objects::nonNull) - .forEach(aMat -> aMaterial.mOreByProducts.add(aMat)); + .map(MATERIALS_MAP::get) + .filter(Objects::nonNull) + .forEach(aMat -> aMaterial.mOreByProducts.add(aMat)); } } } @@ -2808,16 +2721,16 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { */ private static void SubTagCalculation(Materials aMaterial, String aConfigPath) { String aDefaultTagString = aMaterial.mSubTags.stream() - .map(aTag -> aTag.mName) - .collect(Collectors.joining(",", ",", "")); + .map(aTag -> aTag.mName) + .collect(Collectors.joining(",", ",", "")); String aConfigTagString = GregTech_API.sMaterialProperties.get(aConfigPath, "ListSubTags", aDefaultTagString); if (!aConfigTagString.equals(aDefaultTagString)) { aMaterial.mSubTags.clear(); if (aConfigTagString.length() > 0) { Arrays.stream(aConfigTagString.split(",")) - .map(SubTag.sSubTags::get) - .filter(Objects::nonNull) - .forEach(aTag -> aMaterial.mSubTags.add(aTag)); + .map(SubTag.sSubTags::get) + .filter(Objects::nonNull) + .forEach(aTag -> aMaterial.mSubTags.add(aTag)); } } } @@ -2911,8 +2824,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { if (mElement != null) return mElement.mHalfLifeSeconds >= 0; return mMaterialList.stream() - .map(stack -> stack.mMaterial) - .anyMatch(Materials::isRadioactive); + .map(stack -> stack.mMaterial) + .anyMatch(Materials::isRadioactive); } public long getProtons() { @@ -2968,8 +2881,8 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { if (!aShowQuestionMarks && mChemicalFormula.equals("?")) return ""; if (aMultiplier >= M * 2 && !mMaterialList.isEmpty()) { return ((mElement != null || (mMaterialList.size() < 2 && mMaterialList.get(0).mAmount == 1)) - ? mChemicalFormula - : "(" + mChemicalFormula + ")") + aMultiplier; + ? mChemicalFormula + : "(" + mChemicalFormula + ")") + aMultiplier; } return mChemicalFormula; } @@ -2988,13 +2901,9 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public boolean contains(ItemStack... aStacks) { if (aStacks == null || aStacks.length == 0) return false; return mMaterialItems.stream() - .anyMatch( - tStack -> Arrays.stream(aStacks) - .anyMatch( - aStack -> GT_Utility.areStacksEqual( - aStack, - tStack, - !tStack.hasTagCompound()))); + .anyMatch( + tStack -> Arrays.stream(aStacks) + .anyMatch(aStack -> GT_Utility.areStacksEqual(aStack, tStack, !tStack.hasTagCompound()))); } /** @@ -3185,18 +3094,18 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { public String getDefaultLocalizedNameForItem(String aFormat) { return String.format( - aFormat.replace("%s", "%temp") - .replace("%material", "%s"), - this.mDefaultLocalName) - .replace("%temp", "%s"); + aFormat.replace("%s", "%temp") + .replace("%material", "%s"), + this.mDefaultLocalName) + .replace("%temp", "%s"); } public String getLocalizedNameForItem(String aFormat) { return String.format( - aFormat.replace("%s", "%temp") - .replace("%material", "%s"), - this.mLocalizedName) - .replace("%temp", "%s"); + aFormat.replace("%s", "%temp") + .replace("%material", "%s"), + this.mLocalizedName) + .replace("%temp", "%s"); } public boolean hasCorrespondingFluid() { @@ -3303,7 +3212,7 @@ public class Materials implements IColorModulationContainer, ISubTagContainer { */ public boolean isProperSolderingFluid() { return mStandardMoltenFluid != null && contains(SubTag.SOLDERING_MATERIAL) - && !(GregTech_API.mUseOnlyGoodSolderingMaterials && !contains(SubTag.SOLDERING_MATERIAL_GOOD)); + && !(GregTech_API.mUseOnlyGoodSolderingMaterials && !contains(SubTag.SOLDERING_MATERIAL_GOOD)); } public ItemStack getCells(int amount) { diff --git a/src/main/java/gregtech/api/enums/MaterialsBotania.java b/src/main/java/gregtech/api/enums/MaterialsBotania.java index d93b941e39..b82d810a19 100644 --- a/src/main/java/gregtech/api/enums/MaterialsBotania.java +++ b/src/main/java/gregtech/api/enums/MaterialsBotania.java @@ -9,207 +9,187 @@ import gregtech.api.enums.TC_Aspects.TC_AspectStack; public class MaterialsBotania { // Botania materials. - public static Materials Manasteel = new MaterialBuilder( - 201, - TextureSet.SET_METALLIC, - "Manasteel").setName("Manasteel") - .setRGBA(150, 219, 252, 255) - .addDustItems() - .addMetalItems() - .addToolHeadItems() - .addGearItems() - .setToolSpeed(8.0F) - .setDurability(5120) - .setToolQuality(4) - .setMeltingPoint(1500) - .setBlastFurnaceTemp(1500) - .setBlastFurnaceRequired(true) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.METALLUM, 3), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) - .constructMaterial(); - public static Materials Terrasteel = new MaterialBuilder( - 202, - TextureSet.SET_METALLIC, - "Terrasteel").setName("Terrasteel") - .setRGBA(76, 191, 38, 255) - .addDustItems() - .addMetalItems() - .addToolHeadItems() - .addGearItems() - .setToolSpeed(32.0F) - .setDurability(10240) - .setToolQuality(5) - .setMeltingPoint(5400) - .setBlastFurnaceTemp(5400) - .setBlastFurnaceRequired(true) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.METALLUM, 2), - new TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) - .constructMaterial(); - public static Materials ElvenElementium = new MaterialBuilder( - 203, - TextureSet.SET_METALLIC, - "Elven Elementium").setName("ElvenElementium") - .setRGBA(219, 37, 205, 255) - .addDustItems() - .addMetalItems() - .addToolHeadItems() - .addGearItems() - .setToolSpeed(20.0F) - .setDurability(32768) - .setToolQuality(7) - .setMeltingPoint(7200) - .setBlastFurnaceTemp(7200) - .setBlastFurnaceRequired(true) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.METALLUM, 3), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), - new TC_AspectStack(TC_Aspects.AURAM, 1))) - .constructMaterial(); - public static Materials Livingrock = new MaterialBuilder( - 204, - new TextureSet("Livingrock", true), - "Livingrock").setName("Livingrock") - .addDustItems() - .addToolHeadItems() - .addGearItems() - .setToolSpeed(1.0F) - .setDurability(0) - .setToolQuality(3) - .setOreValue(3) - .setDensityMultiplier(1) - .setDensityDivider(1) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.TERRA, 2), - new TC_AspectStack(TC_Aspects.VICTUS, 2))) - .constructMaterial(); + public static Materials Manasteel = new MaterialBuilder(201, TextureSet.SET_METALLIC, "Manasteel") + .setName("Manasteel") + .setRGBA(150, 219, 252, 255) + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(8.0F) + .setDurability(5120) + .setToolQuality(4) + .setMeltingPoint(1500) + .setBlastFurnaceTemp(1500) + .setBlastFurnaceRequired(true) + .setAspects( + Arrays.asList(new TC_AspectStack(TC_Aspects.METALLUM, 3), new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) + .constructMaterial(); + public static Materials Terrasteel = new MaterialBuilder(202, TextureSet.SET_METALLIC, "Terrasteel") + .setName("Terrasteel") + .setRGBA(76, 191, 38, 255) + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(32.0F) + .setDurability(10240) + .setToolQuality(5) + .setMeltingPoint(5400) + .setBlastFurnaceTemp(5400) + .setBlastFurnaceRequired(true) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.METALLUM, 2), + new TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) + .constructMaterial(); + public static Materials ElvenElementium = new MaterialBuilder(203, TextureSet.SET_METALLIC, "Elven Elementium") + .setName("ElvenElementium") + .setRGBA(219, 37, 205, 255) + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(20.0F) + .setDurability(32768) + .setToolQuality(7) + .setMeltingPoint(7200) + .setBlastFurnaceTemp(7200) + .setBlastFurnaceRequired(true) + .setAspects( + Arrays.asList( + new TC_AspectStack(TC_Aspects.METALLUM, 3), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 2), + new TC_AspectStack(TC_Aspects.AURAM, 1))) + .constructMaterial(); + public static Materials Livingrock = new MaterialBuilder(204, new TextureSet("Livingrock", true), "Livingrock") + .setName("Livingrock") + .addDustItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(1.0F) + .setDurability(0) + .setToolQuality(3) + .setOreValue(3) + .setDensityMultiplier(1) + .setDensityDivider(1) + .setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.TERRA, 2), new TC_AspectStack(TC_Aspects.VICTUS, 2))) + .constructMaterial(); public static Materials GaiaSpirit = new Materials( - 205, - TextureSet.SET_METALLIC.withBlockTextures("GaiaSpirit"), - 32.0F, - 850000, - 12, - 1 | 2 | 64 | 128, - 255, - 255, - 255, - 0, - "GaiaSpirit", - "Gaia Spirit", - -1, - -1, - 0, - 0, - false, - true, - 2, - 1, - 1, - Dyes._NULL, + 205, + TextureSet.SET_METALLIC.withBlockTextures("GaiaSpirit"), + 32.0F, + 850000, + 12, + 1 | 2 | 64 | 128, + 255, + 255, + 255, + 0, + "GaiaSpirit", + "Gaia Spirit", + -1, + -1, + 0, + 0, + false, + true, + 2, + 1, + 1, + Dyes._NULL, + Arrays.asList( + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 27), + new TC_AspectStack(TC_Aspects.AURAM, 24), + new TC_AspectStack(TC_Aspects.VICTUS, 24), + new TC_AspectStack(TC_Aspects.METALLUM, 1))); + public static Materials Livingwood = new MaterialBuilder(206, new TextureSet("Livingwood", true), "Livingwood") + .setName("Livingwood") + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(1.0F) + .setDurability(0) + .setToolQuality(3) + .setOreValue(3) + .setDensityMultiplier(1) + .setDensityDivider(1) + .setAspects(Arrays.asList(new TC_AspectStack(TC_Aspects.ARBOR, 4), new TC_AspectStack(TC_Aspects.VICTUS, 2))) + .constructMaterial(); + public static Materials Dreamwood = new MaterialBuilder(207, new TextureSet("Dreamwood", true), "Dreamwood") + .setName("Dreamwood") + .addDustItems() + .addMetalItems() + .addToolHeadItems() + .addGearItems() + .setToolSpeed(1.0F) + .setDurability(0) + .setToolQuality(3) + .setOreValue(3) + .setDensityMultiplier(1) + .setDensityDivider(1) + .setAspects( Arrays.asList( - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 27), - new TC_AspectStack(TC_Aspects.AURAM, 24), - new TC_AspectStack(TC_Aspects.VICTUS, 24), - new TC_AspectStack(TC_Aspects.METALLUM, 1))); - public static Materials Livingwood = new MaterialBuilder( - 206, - new TextureSet("Livingwood", true), - "Livingwood").setName("Livingwood") - .addDustItems() - .addMetalItems() - .addToolHeadItems() - .addGearItems() - .setToolSpeed(1.0F) - .setDurability(0) - .setToolQuality(3) - .setOreValue(3) - .setDensityMultiplier(1) - .setDensityDivider(1) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.ARBOR, 4), - new TC_AspectStack(TC_Aspects.VICTUS, 2))) - .constructMaterial(); - public static Materials Dreamwood = new MaterialBuilder( - 207, - new TextureSet("Dreamwood", true), - "Dreamwood").setName("Dreamwood") - .addDustItems() - .addMetalItems() - .addToolHeadItems() - .addGearItems() - .setToolSpeed(1.0F) - .setDurability(0) - .setToolQuality(3) - .setOreValue(3) - .setDensityMultiplier(1) - .setDensityDivider(1) - .setAspects( - Arrays.asList( - new TC_AspectStack(TC_Aspects.ARBOR, 4), - new TC_AspectStack(TC_Aspects.AURAM, 2), - new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) - .constructMaterial(); + new TC_AspectStack(TC_Aspects.ARBOR, 4), + new TC_AspectStack(TC_Aspects.AURAM, 2), + new TC_AspectStack(TC_Aspects.PRAECANTATIO, 1))) + .constructMaterial(); public static Materials ManaDiamond = new Materials( - 208, - TextureSet.SET_DIAMOND, - 16.0F, - 2560, - 8, - 1 | 4, - 38, - 237, - 224, - 255, - "ManaDiamond", - "Mana Diamond", - -1, - -1, - 0, - 0, - false, - true, - 2, - 1, - 1, - Dyes._NULL, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 4), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 4))); + 208, + TextureSet.SET_DIAMOND, + 16.0F, + 2560, + 8, + 1 | 4, + 38, + 237, + 224, + 255, + "ManaDiamond", + "Mana Diamond", + -1, + -1, + 0, + 0, + false, + true, + 2, + 1, + 1, + Dyes._NULL, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 4), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 4), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 4))); public static Materials BotaniaDragonstone = new Materials( - 209, - TextureSet.SET_DIAMOND, - 24.0F, - 3840, - 12, - 1 | 4, - 242, - 44, - 239, - 255, - "BotaniaDragonstone", - "Dragonstone", - -1, - -1, - 0, - 0, - false, - true, - 2, - 1, - 1, - Dyes._NULL, - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 6), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 6), - new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 4))); + 209, + TextureSet.SET_DIAMOND, + 24.0F, + 3840, + 12, + 1 | 4, + 242, + 44, + 239, + 255, + "BotaniaDragonstone", + "Dragonstone", + -1, + -1, + 0, + 0, + false, + true, + 2, + 1, + 1, + Dyes._NULL, + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.PRAECANTATIO, 6), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 6), + new TC_Aspects.TC_AspectStack(TC_Aspects.AURAM, 4))); public static void init() { GaiaSpirit.mChemicalFormula = "Gs"; diff --git a/src/main/java/gregtech/api/enums/MaterialsKevlar.java b/src/main/java/gregtech/api/enums/MaterialsKevlar.java index a5c38b0f7a..647fe08ef4 100644 --- a/src/main/java/gregtech/api/enums/MaterialsKevlar.java +++ b/src/main/java/gregtech/api/enums/MaterialsKevlar.java @@ -7,690 +7,590 @@ import gregtech.api.objects.MaterialStack; public class MaterialsKevlar { public static Materials DiphenylmethaneDiisocyanate = new MaterialBuilder( - 796, - TextureSet.SET_DULL, - "4,4'-Diphenylmethane Diisocyanate").setName("DiphenylmethaneDiisocyanate") - .addDustItems() - .setRGB(255, 230, 50) - .setColor(Dyes.dyeYellow) - .setMeltingPoint(310) - .setMaterialList( - new MaterialStack(Materials.Carbon, 15), - new MaterialStack(Materials.Hydrogen, 10), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C15H10N2O2 + 796, + TextureSet.SET_DULL, + "4,4'-Diphenylmethane Diisocyanate").setName("DiphenylmethaneDiisocyanate") + .addDustItems() + .setRGB(255, 230, 50) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(310) + .setMaterialList( + new MaterialStack(Materials.Carbon, 15), + new MaterialStack(Materials.Hydrogen, 10), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C15H10N2O2 public static Materials DiaminodiphenylmethanMixture = new MaterialBuilder( - 795, - TextureSet.SET_FLUID, - "Diaminodiphenylmethane Mixture").setName("DiaminodiphenylmethanMixture") - .addCell() - .addFluid() - .setRGB(255, 243, 122) - .setColor(Dyes.dyeYellow) - .setMeltingPoint(365) - .setMaterialList( - new MaterialStack(Materials.Carbon, 13), - new MaterialStack(Materials.Hydrogen, 14), - new MaterialStack(Materials.Nitrogen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C13H14N2 + 795, + TextureSet.SET_FLUID, + "Diaminodiphenylmethane Mixture").setName("DiaminodiphenylmethanMixture") + .addCell() + .addFluid() + .setRGB(255, 243, 122) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(365) + .setMaterialList( + new MaterialStack(Materials.Carbon, 13), + new MaterialStack(Materials.Hydrogen, 14), + new MaterialStack(Materials.Nitrogen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C13H14N2 public static Materials DiphenylmethaneDiisocyanateMixture = new MaterialBuilder( - 794, - TextureSet.SET_FLUID, - "Diphenylmethane Diisocyanate Mixture").setName("DiphenylmethaneDiisocyanateMixture") - .addCell() - .addFluid() - .setRGB(255, 230, 50) - .setColor(Dyes.dyeYellow) - .setMeltingPoint(310) - .setMaterialList( - new MaterialStack(Materials.Carbon, 15), - new MaterialStack(Materials.Hydrogen, 10), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack( - TC_Aspects.VENENUM, - 1))) - .constructMaterial(); // C15H10N2O2 - public static Materials Butyraldehyde = new MaterialBuilder( - 793, - TextureSet.SET_FLUID, - "Butyraldehyde").setName("Butyraldehyde") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(176) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 8), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C4H8O - public static Materials Isobutyraldehyde = new MaterialBuilder( - 792, - TextureSet.SET_FLUID, - "Isobutyraldehyde").setName("Isobutyraldehyde") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(208) - .setExtraData(1) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 8), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C4H8O - public static Materials NickelTetracarbonyl = new MaterialBuilder( - 791, - TextureSet.SET_FLUID, - "Nickel Tetracarbonyl").setName("NickelTetracarbonyl") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(256) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Nickel, 1), - new MaterialStack(Materials.Oxygen, 4)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1))) - .constructMaterial(); // C4NiO4 - public static Materials KevlarCatalyst = new MaterialBuilder( - 790, - TextureSet.SET_DULL, - "Polyurethane Catalyst A").setName("PolyurethaneCatalystADust") - .addDustItems() - .setRGB(50, 50, 50) - .setColor(Dyes.dyeBlack) - .setMeltingPoint(300) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) - .constructMaterial(); - public static Materials EthyleneOxide = new MaterialBuilder( - 789, - TextureSet.SET_FLUID, - "Ethylene Oxide").setName("EthyleneOxide") - .addCell() - .addGas() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(160) - .setMaterialList( - new MaterialStack(Materials.Carbon, 2), - new MaterialStack(Materials.Hydrogen, 4), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C2H4O - public static Materials SiliconOil = new MaterialBuilder( - 788, - TextureSet.SET_FLUID, - "Silicon Oil").setName("SiliconOil") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(473) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1))) - .constructMaterial(); - public static Materials Ethyleneglycol = new MaterialBuilder( - 787, - TextureSet.SET_FLUID, - "Ethylene Glycol").setName("EthyleneGlycol") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(260) - .setMaterialList( - new MaterialStack(Materials.Carbon, 2), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C2H6O2 - public static Materials Acetaldehyde = new MaterialBuilder( - 786, - TextureSet.SET_FLUID, - "Acetaldehyde").setName("Acetaldehyde") - .addCell() - .addGas() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(150) - .setMaterialList( - new MaterialStack(Materials.Carbon, 2), - new MaterialStack(Materials.Hydrogen, 4), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) - .constructMaterial(); // C2H4O - public static Materials Pentaerythritol = new MaterialBuilder( - 785, - TextureSet.SET_DULL, - "Pentaerythritol").setName("Pentaerythritol") - .addDustItems() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(533) - .setMaterialList( - new MaterialStack(Materials.Carbon, 5), - new MaterialStack(Materials.Hydrogen, 12), - new MaterialStack(Materials.Oxygen, 4)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) - .constructMaterial(); // C5H12O4 - public static Materials PolyurethaneResin = new MaterialBuilder( - 784, - TextureSet.SET_FLUID, - "Polyurethane Resin").setName("PolyurethaneResin") - .addCell() - .addFluid() - .setRGB(230, 230, 120) - .setColor(Dyes.dyeYellow) - .constructMaterial(); + 794, + TextureSet.SET_FLUID, + "Diphenylmethane Diisocyanate Mixture").setName("DiphenylmethaneDiisocyanateMixture") + .addCell() + .addFluid() + .setRGB(255, 230, 50) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(310) + .setMaterialList( + new MaterialStack(Materials.Carbon, 15), + new MaterialStack(Materials.Hydrogen, 10), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C15H10N2O2 + public static Materials Butyraldehyde = new MaterialBuilder(793, TextureSet.SET_FLUID, "Butyraldehyde") + .setName("Butyraldehyde") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(176) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 8), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C4H8O + public static Materials Isobutyraldehyde = new MaterialBuilder(792, TextureSet.SET_FLUID, "Isobutyraldehyde") + .setName("Isobutyraldehyde") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(208) + .setExtraData(1) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 8), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C4H8O + public static Materials NickelTetracarbonyl = new MaterialBuilder(791, TextureSet.SET_FLUID, "Nickel Tetracarbonyl") + .setName("NickelTetracarbonyl") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(256) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Nickel, 1), + new MaterialStack(Materials.Oxygen, 4)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.METALLUM, 1))) + .constructMaterial(); // C4NiO4 + public static Materials KevlarCatalyst = new MaterialBuilder(790, TextureSet.SET_DULL, "Polyurethane Catalyst A") + .setName("PolyurethaneCatalystADust") + .addDustItems() + .setRGB(50, 50, 50) + .setColor(Dyes.dyeBlack) + .setMeltingPoint(300) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) + .constructMaterial(); + public static Materials EthyleneOxide = new MaterialBuilder(789, TextureSet.SET_FLUID, "Ethylene Oxide") + .setName("EthyleneOxide") + .addCell() + .addGas() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(160) + .setMaterialList( + new MaterialStack(Materials.Carbon, 2), + new MaterialStack(Materials.Hydrogen, 4), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C2H4O + public static Materials SiliconOil = new MaterialBuilder(788, TextureSet.SET_FLUID, "Silicon Oil") + .setName("SiliconOil") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(473) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.MACHINA, 1))) + .constructMaterial(); + public static Materials Ethyleneglycol = new MaterialBuilder(787, TextureSet.SET_FLUID, "Ethylene Glycol") + .setName("EthyleneGlycol") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(260) + .setMaterialList( + new MaterialStack(Materials.Carbon, 2), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C2H6O2 + public static Materials Acetaldehyde = new MaterialBuilder(786, TextureSet.SET_FLUID, "Acetaldehyde") + .setName("Acetaldehyde") + .addCell() + .addGas() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(150) + .setMaterialList( + new MaterialStack(Materials.Carbon, 2), + new MaterialStack(Materials.Hydrogen, 4), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.AQUA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.IGNIS, 1))) + .constructMaterial(); // C2H4O + public static Materials Pentaerythritol = new MaterialBuilder(785, TextureSet.SET_DULL, "Pentaerythritol") + .setName("Pentaerythritol") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(533) + .setMaterialList( + new MaterialStack(Materials.Carbon, 5), + new MaterialStack(Materials.Hydrogen, 12), + new MaterialStack(Materials.Oxygen, 4)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.LUCRUM, 1))) + .constructMaterial(); // C5H12O4 + public static Materials PolyurethaneResin = new MaterialBuilder(784, TextureSet.SET_FLUID, "Polyurethane Resin") + .setName("PolyurethaneResin") + .addCell() + .addFluid() + .setRGB(230, 230, 120) + .setColor(Dyes.dyeYellow) + .constructMaterial(); public static Materials NMethylIIPyrrolidone = new MaterialBuilder( - 783, - TextureSet.SET_FLUID, - "N-Methyl-2-pyrrolidone").setName("NMethylpyrolidone") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(249) - .setMaterialList( - new MaterialStack(Materials.Carbon, 5), - new MaterialStack(Materials.Hydrogen, 9), - new MaterialStack(Materials.Nitrogen, 1), - new MaterialStack(Materials.Oxygen, 1)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) - .constructMaterial(); // C5H9NO + 783, + TextureSet.SET_FLUID, + "N-Methyl-2-pyrrolidone").setName("NMethylpyrolidone") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(249) + .setMaterialList( + new MaterialStack(Materials.Carbon, 5), + new MaterialStack(Materials.Hydrogen, 9), + new MaterialStack(Materials.Nitrogen, 1), + new MaterialStack(Materials.Oxygen, 1)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VENENUM, 1))) + .constructMaterial(); // C5H9NO public static Materials TerephthaloylChloride = new MaterialBuilder( - 782, - TextureSet.SET_POWDER, - "Terephthaloyl Chloride").setName("TerephthaloylChloride") - .addDustItems() - .setRGB(0, 255, 12) - .setColor(Dyes.dyeGreen) - .setMeltingPoint(355) - .setMaterialList( - new MaterialStack(Materials.Carbon, 8), - new MaterialStack(Materials.Hydrogen, 4), - new MaterialStack(Materials.Chlorine, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) - .constructMaterial(); // C8H4Cl2O2 + 782, + TextureSet.SET_POWDER, + "Terephthaloyl Chloride").setName("TerephthaloylChloride") + .addDustItems() + .setRGB(0, 255, 12) + .setColor(Dyes.dyeGreen) + .setMeltingPoint(355) + .setMaterialList( + new MaterialStack(Materials.Carbon, 8), + new MaterialStack(Materials.Hydrogen, 4), + new MaterialStack(Materials.Chlorine, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) + .constructMaterial(); // C8H4Cl2O2 public static Materials Acetylene = new MaterialBuilder(781, TextureSet.SET_FLUID, "Acetylene").setName("Acetylene") - .addCell() - .addGas() - .setRGB( - 255, - 255, - 255) - .setColor( - Dyes.dyeWhite) - .setMeltingPoint(192) - .setMaterialList( - new MaterialStack( - Materials.Carbon, - 2), - new MaterialStack( - Materials.Hydrogen, - 2)) - .constructMaterial(); // C2H2 - // TODO - // Add - // to - // JUPITER - // Athmosphere - // and - // Enceladus - // and - // to - // moon - // of - // Saturn - public static Materials IVNitroaniline = new MaterialBuilder( - 780, - TextureSet.SET_FLUID, - "4-Nitroaniline").setName("4Nitroaniline") - .addCell() - .addFluid() - .setRGB(255, 135, 51) - .setColor(Dyes.dyeOrange) - .setMeltingPoint(420) - .setMaterialList( - new MaterialStack(Materials.Carbon, 6), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) - .constructMaterial(); // C6H6N2O2 + .addCell() + .addGas() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(192) + .setMaterialList(new MaterialStack(Materials.Carbon, 2), new MaterialStack(Materials.Hydrogen, 2)) + .constructMaterial(); // C2H2 + // TODO + // Add + // to + // JUPITER + // Athmosphere + // and + // Enceladus + // and + // to + // moon + // of + // Saturn + public static Materials IVNitroaniline = new MaterialBuilder(780, TextureSet.SET_FLUID, "4-Nitroaniline") + .setName("4Nitroaniline") + .addCell() + .addFluid() + .setRGB(255, 135, 51) + .setColor(Dyes.dyeOrange) + .setMeltingPoint(420) + .setMaterialList( + new MaterialStack(Materials.Carbon, 6), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) + .constructMaterial(); // C6H6N2O2 public static Materials ParaPhenylenediamine = new MaterialBuilder( - 779, - TextureSet.SET_POWDER, - "para-Phenylenediamine").setName("pPhenylenediamine") - .addDustItems() - .setRGB(251, 236, 93) - .setColor(Dyes.dyeYellow) - .setMeltingPoint(293) - .setMaterialList( - new MaterialStack(Materials.Carbon, 6), - new MaterialStack(Materials.Hydrogen, 8), - new MaterialStack(Materials.Nitrogen, 2)) - .setAspects( - Arrays.asList( - new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), - new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) - .constructMaterial(); // C6H6N2 - public static Materials Methylamine = new MaterialBuilder( - 778, - TextureSet.SET_FLUID, - "Methylamine").setName("Methylamine") - .addCell() - .addGas() - .setRGB(65, 68, 105) - .setColor(Dyes.dyeGray) - .setMeltingPoint(180) - .setExtraData(1) - .setMaterialList( - new MaterialStack(Materials.Carbon, 1), - new MaterialStack(Materials.Hydrogen, 5), - new MaterialStack(Materials.Nitrogen, 1)) - .constructMaterial(); // CH5N - public static Materials Trimethylamine = new MaterialBuilder( - 777, - TextureSet.SET_FLUID, - "Trimethylamine").setName("Trimethylamine") - .addCell() - .addGas() - .setRGB(105, 68, 105) - .setColor(Dyes.dyeGray) - .setMeltingPoint(156) - .setExtraData(1) - .setMaterialList( - new MaterialStack(Materials.Carbon, 3), - new MaterialStack(Materials.Hydrogen, 9), - new MaterialStack(Materials.Nitrogen, 1)) - .constructMaterial(); // C3H9N - public static Materials GammaButyrolactone = new MaterialBuilder( - 776, - TextureSet.SET_FLUID, - "gamma-Butyrolactone").setName("GammaButyrolactone") - .addCell() - .addFluid() - .setRGB(255, 255, 151) - .setColor(Dyes.dyeYellow) - .setMeltingPoint(229) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 2)) - .constructMaterial(); // C4H6O2 - public static Materials CalciumCarbide = new MaterialBuilder( - 775, - TextureSet.SET_DULL, - "Calcium Carbide").setName("CacliumCarbide") - .addDustItems() - .setRGB(235, 235, 235) - .setColor(Dyes.dyeGray) - .setMeltingPoint(2430) - .setMaterialList( - new MaterialStack(Materials.Calcium, 1), - new MaterialStack(Materials.Carbon, 2)) - .constructMaterial(); // CaC2 + 779, + TextureSet.SET_POWDER, + "para-Phenylenediamine").setName("pPhenylenediamine") + .addDustItems() + .setRGB(251, 236, 93) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(293) + .setMaterialList( + new MaterialStack(Materials.Carbon, 6), + new MaterialStack(Materials.Hydrogen, 8), + new MaterialStack(Materials.Nitrogen, 2)) + .setAspects( + Arrays.asList( + new TC_Aspects.TC_AspectStack(TC_Aspects.TERRA, 1), + new TC_Aspects.TC_AspectStack(TC_Aspects.VITREUS, 1))) + .constructMaterial(); // C6H6N2 + public static Materials Methylamine = new MaterialBuilder(778, TextureSet.SET_FLUID, "Methylamine") + .setName("Methylamine") + .addCell() + .addGas() + .setRGB(65, 68, 105) + .setColor(Dyes.dyeGray) + .setMeltingPoint(180) + .setExtraData(1) + .setMaterialList( + new MaterialStack(Materials.Carbon, 1), + new MaterialStack(Materials.Hydrogen, 5), + new MaterialStack(Materials.Nitrogen, 1)) + .constructMaterial(); // CH5N + public static Materials Trimethylamine = new MaterialBuilder(777, TextureSet.SET_FLUID, "Trimethylamine") + .setName("Trimethylamine") + .addCell() + .addGas() + .setRGB(105, 68, 105) + .setColor(Dyes.dyeGray) + .setMeltingPoint(156) + .setExtraData(1) + .setMaterialList( + new MaterialStack(Materials.Carbon, 3), + new MaterialStack(Materials.Hydrogen, 9), + new MaterialStack(Materials.Nitrogen, 1)) + .constructMaterial(); // C3H9N + public static Materials GammaButyrolactone = new MaterialBuilder(776, TextureSet.SET_FLUID, "gamma-Butyrolactone") + .setName("GammaButyrolactone") + .addCell() + .addFluid() + .setRGB(255, 255, 151) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(229) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 2)) + .constructMaterial(); // C4H6O2 + public static Materials CalciumCarbide = new MaterialBuilder(775, TextureSet.SET_DULL, "Calcium Carbide") + .setName("CacliumCarbide") + .addDustItems() + .setRGB(235, 235, 235) + .setColor(Dyes.dyeGray) + .setMeltingPoint(2430) + .setMaterialList(new MaterialStack(Materials.Calcium, 1), new MaterialStack(Materials.Carbon, 2)) + .constructMaterial(); // CaC2 public static Materials LiquidCrystalKevlar = new MaterialBuilder( - 774, - TextureSet.SET_FLUID, - "Liquid Crystal Kevlar").setName("LiquidCrystalKevlar") - .addCell() - .addFluid() - .setRGB(240, 240, 120) - .setColor(Dyes.dyeYellow) - .constructMaterial(); // [-CO-C6H4-CO-NH-C6H4-NH-]n - public static Materials IIButinIIVdiol = new MaterialBuilder( - 773, - TextureSet.SET_POWDER, - "2-Butin-1,4-diol").setName("2Butin14diol") - .addDustItems() - .setRGB(247, 247, 180) - .setColor(Dyes.dyeYellow) - .setMeltingPoint(331) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 2)) - .constructMaterial(); // C4H6O2 - public static Materials NickelAluminide = new MaterialBuilder( - 772, - TextureSet.SET_METALLIC, - "Nickel Aluminide").setName("NickelAluminide") - .addDustItems() - .addMetalItems() - .setRGB(230, 230, 230) - .setColor(Dyes.dyeGray) - .setMeltingPoint(1668) - .setBlastFurnaceTemp(1668) - .setBlastFurnaceRequired(true) - .setMaterialList( - new MaterialStack(Materials.Nickel, 1), - new MaterialStack(Materials.Aluminium, 3)) - .constructMaterial() - .disableAutoGeneratedBlastFurnaceRecipes(); // NiAl3 - public static Materials RaneyNickelActivated = new MaterialBuilder( - 771, - TextureSet.SET_POWDER, - "Raney Nickel").setName("RaneyNickelActivated") - .addDustItems() - .setRGB(230, 230, 230) - .setColor(Dyes.dyeGray) - .setMeltingPoint(1955) - .setMaterialList( - new MaterialStack(Materials.Nickel, 1), - new MaterialStack(Materials.Aluminium, 1)) - .constructMaterial(); // NiAl - public static Materials BismuthIIIOxide = new MaterialBuilder( - 769, - TextureSet.SET_POWDER, - "Bismuth Oxide").setName("BismuthIIIOxide") - .addDustItems() - .setRGB(50, 50, 50) - .setColor(Dyes.dyeBlack) - .setMeltingPoint(1090) - .setMaterialList( - new MaterialStack(Materials.Bismuth, 2), - new MaterialStack(Materials.Oxygen, 3)) - .constructMaterial(); // Bi2O3 - public static Materials ThionylChloride = new MaterialBuilder( - 768, - TextureSet.SET_FLUID, - "Thionyl Chloride").setName("ThionylChloride") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .constructMaterial(); // SOCl2 - public static Materials SulfurDichloride = new MaterialBuilder( - 767, - TextureSet.SET_FLUID, - "Sulfur Dichloride").setName("SulfurDichloride") - .addCell() - .addFluid() - .setRGB(200, 0, 0) - .setColor(Dyes.dyeRed) - .constructMaterial(); // SCl2 + 774, + TextureSet.SET_FLUID, + "Liquid Crystal Kevlar").setName("LiquidCrystalKevlar") + .addCell() + .addFluid() + .setRGB(240, 240, 120) + .setColor(Dyes.dyeYellow) + .constructMaterial(); // [-CO-C6H4-CO-NH-C6H4-NH-]n + public static Materials IIButinIIVdiol = new MaterialBuilder(773, TextureSet.SET_POWDER, "2-Butin-1,4-diol") + .setName("2Butin14diol") + .addDustItems() + .setRGB(247, 247, 180) + .setColor(Dyes.dyeYellow) + .setMeltingPoint(331) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 2)) + .constructMaterial(); // C4H6O2 + public static Materials NickelAluminide = new MaterialBuilder(772, TextureSet.SET_METALLIC, "Nickel Aluminide") + .setName("NickelAluminide") + .addDustItems() + .addMetalItems() + .setRGB(230, 230, 230) + .setColor(Dyes.dyeGray) + .setMeltingPoint(1668) + .setBlastFurnaceTemp(1668) + .setBlastFurnaceRequired(true) + .setMaterialList(new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Aluminium, 3)) + .constructMaterial() + .disableAutoGeneratedBlastFurnaceRecipes(); // NiAl3 + public static Materials RaneyNickelActivated = new MaterialBuilder(771, TextureSet.SET_POWDER, "Raney Nickel") + .setName("RaneyNickelActivated") + .addDustItems() + .setRGB(230, 230, 230) + .setColor(Dyes.dyeGray) + .setMeltingPoint(1955) + .setMaterialList(new MaterialStack(Materials.Nickel, 1), new MaterialStack(Materials.Aluminium, 1)) + .constructMaterial(); // NiAl + public static Materials BismuthIIIOxide = new MaterialBuilder(769, TextureSet.SET_POWDER, "Bismuth Oxide") + .setName("BismuthIIIOxide") + .addDustItems() + .setRGB(50, 50, 50) + .setColor(Dyes.dyeBlack) + .setMeltingPoint(1090) + .setMaterialList(new MaterialStack(Materials.Bismuth, 2), new MaterialStack(Materials.Oxygen, 3)) + .constructMaterial(); // Bi2O3 + public static Materials ThionylChloride = new MaterialBuilder(768, TextureSet.SET_FLUID, "Thionyl Chloride") + .setName("ThionylChloride") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .constructMaterial(); // SOCl2 + public static Materials SulfurDichloride = new MaterialBuilder(767, TextureSet.SET_FLUID, "Sulfur Dichloride") + .setName("SulfurDichloride") + .addCell() + .addFluid() + .setRGB(200, 0, 0) + .setColor(Dyes.dyeRed) + .constructMaterial(); // SCl2 public static Materials DimethylTerephthalate = new MaterialBuilder( - 766, - TextureSet.SET_FLUID, - "Dimethyl Terephthalate").setName("DimethylTerephthalate") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(415) - .setMaterialList( - new MaterialStack(Materials.Carbon, 10), - new MaterialStack(Materials.Hydrogen, 10), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // C10H10O4 + 766, + TextureSet.SET_FLUID, + "Dimethyl Terephthalate").setName("DimethylTerephthalate") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(415) + .setMaterialList( + new MaterialStack(Materials.Carbon, 10), + new MaterialStack(Materials.Hydrogen, 10), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // C10H10O4 public static Materials Kevlar = new MaterialBuilder(765, TextureSet.SET_DULL, "Kevlar").setName("Kevlar") - .addDustItems() - .addMetalItems() - .addGearItems() - .setRGB(240, 240, 120) - .setColor(Dyes.dyeYellow) - .constructMaterial(); - public static Materials TerephthalicAcid = new MaterialBuilder( - 764, - TextureSet.SET_FLUID, - "Terephthalic Acid").setName("TerephthalicAcid") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(480) - .setMaterialList( - new MaterialStack(Materials.Carbon, 8L), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // C9H6O6 - public static Materials IIIDimethylbenzene = new MaterialBuilder( - 763, - TextureSet.SET_FLUID, - "1,3-Dimethylbenzen").addCell() - .addFluid() - .setRGB(112, 146, 74) - .setColor(Dyes.dyeLime) - .setMeltingPoint(225) - .setMaterialList( - new MaterialStack(Materials.Carbon, 8), - new MaterialStack(Materials.Hydrogen, 10)) - .addElectrolyzerRecipe() - .constructMaterial(); // C8H10 - public static Materials IVDimethylbenzene = new MaterialBuilder( - 762, - TextureSet.SET_FLUID, - "1,4-Dimethylbenzen").addCell() - .addFluid() - .setRGB(122, 136, 84) - .setColor(Dyes.dyeLime) - .setMeltingPoint(286) - .setMaterialList( - new MaterialStack(Materials.Carbon, 8), - new MaterialStack(Materials.Hydrogen, 10)) - .addElectrolyzerRecipe() - .constructMaterial(); // C8H10 - public static Materials CobaltIINaphthenate = new MaterialBuilder( - 761, - TextureSet.SET_DULL, - "Cobalt II Naphthenate").setName("Cobalt(II)Naphthenate") - .addDustItems() - .setRGB(143, 95, 39) - .setColor(Dyes.dyeBrown) - .setMeltingPoint(413) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Carbon, 22), - new MaterialStack(Materials.Hydrogen, 14), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // CoC22H14O4 - public static Materials NaphthenicAcid = new MaterialBuilder( - 760, - TextureSet.SET_FLUID, - "Naphthenic Acid").setName("NaphthenicAcid") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setFuelType(MaterialBuilder.SEMIFLUID) - .setFuelPower(80) - .constructMaterial(); - public static Materials CobaltIIHydroxide = new MaterialBuilder( - 759, - TextureSet.SET_POWDER, - "Cobalt II Hydroxide").setName("CobaltIIHydroxide") - .addDustItems() - .setRGB(229, 140, 239) - .setColor(Dyes.dyePurple) - .setMeltingPoint(441) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Hydrogen, 2), - new MaterialStack(Materials.Oxygen, 2)) - .constructMaterial(); // CoH2O2 - public static Materials CobaltIIAcetate = new MaterialBuilder( - 758, - TextureSet.SET_POWDER, - "Cobalt II Acetate").setName("Cobalt(II)Acetate") - .addDustItems() - .setRGB(219, 162, 229) - .setColor(Dyes.dyePurple) - .setMeltingPoint(413) - .setMaterialList( - new MaterialStack(Materials.Carbon, 4L), - new MaterialStack(Materials.Hydrogen, 6), - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Oxygen, 4)) - .constructMaterial(); // C4H6CoO4 - public static Materials CobaltIINitrate = new MaterialBuilder( - 757, - TextureSet.SET_POWDER, - "Cobalt II Nitrate").setName("Cobalt(II)Nitrate") - .addDustItems() - .setRGB(170, 0, 0) - .setColor(Dyes.dyeRed) - .setMeltingPoint(373) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.Nitrogen, 2), - new MaterialStack(Materials.Oxygen, 6)) - .constructMaterial(); // Co(NO3)2 + .addDustItems() + .addMetalItems() + .addGearItems() + .setRGB(240, 240, 120) + .setColor(Dyes.dyeYellow) + .constructMaterial(); + public static Materials TerephthalicAcid = new MaterialBuilder(764, TextureSet.SET_FLUID, "Terephthalic Acid") + .setName("TerephthalicAcid") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(480) + .setMaterialList( + new MaterialStack(Materials.Carbon, 8L), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // C9H6O6 + public static Materials IIIDimethylbenzene = new MaterialBuilder(763, TextureSet.SET_FLUID, "1,3-Dimethylbenzen") + .addCell() + .addFluid() + .setRGB(112, 146, 74) + .setColor(Dyes.dyeLime) + .setMeltingPoint(225) + .setMaterialList(new MaterialStack(Materials.Carbon, 8), new MaterialStack(Materials.Hydrogen, 10)) + .addElectrolyzerRecipe() + .constructMaterial(); // C8H10 + public static Materials IVDimethylbenzene = new MaterialBuilder(762, TextureSet.SET_FLUID, "1,4-Dimethylbenzen") + .addCell() + .addFluid() + .setRGB(122, 136, 84) + .setColor(Dyes.dyeLime) + .setMeltingPoint(286) + .setMaterialList(new MaterialStack(Materials.Carbon, 8), new MaterialStack(Materials.Hydrogen, 10)) + .addElectrolyzerRecipe() + .constructMaterial(); // C8H10 + public static Materials CobaltIINaphthenate = new MaterialBuilder(761, TextureSet.SET_DULL, "Cobalt II Naphthenate") + .setName("Cobalt(II)Naphthenate") + .addDustItems() + .setRGB(143, 95, 39) + .setColor(Dyes.dyeBrown) + .setMeltingPoint(413) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Carbon, 22), + new MaterialStack(Materials.Hydrogen, 14), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // CoC22H14O4 + public static Materials NaphthenicAcid = new MaterialBuilder(760, TextureSet.SET_FLUID, "Naphthenic Acid") + .setName("NaphthenicAcid") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setFuelType(MaterialBuilder.SEMIFLUID) + .setFuelPower(80) + .constructMaterial(); + public static Materials CobaltIIHydroxide = new MaterialBuilder(759, TextureSet.SET_POWDER, "Cobalt II Hydroxide") + .setName("CobaltIIHydroxide") + .addDustItems() + .setRGB(229, 140, 239) + .setColor(Dyes.dyePurple) + .setMeltingPoint(441) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Hydrogen, 2), + new MaterialStack(Materials.Oxygen, 2)) + .constructMaterial(); // CoH2O2 + public static Materials CobaltIIAcetate = new MaterialBuilder(758, TextureSet.SET_POWDER, "Cobalt II Acetate") + .setName("Cobalt(II)Acetate") + .addDustItems() + .setRGB(219, 162, 229) + .setColor(Dyes.dyePurple) + .setMeltingPoint(413) + .setMaterialList( + new MaterialStack(Materials.Carbon, 4L), + new MaterialStack(Materials.Hydrogen, 6), + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Oxygen, 4)) + .constructMaterial(); // C4H6CoO4 + public static Materials CobaltIINitrate = new MaterialBuilder(757, TextureSet.SET_POWDER, "Cobalt II Nitrate") + .setName("Cobalt(II)Nitrate") + .addDustItems() + .setRGB(170, 0, 0) + .setColor(Dyes.dyeRed) + .setMeltingPoint(373) + .setMaterialList( + new MaterialStack(Materials.Cobalt, 1), + new MaterialStack(Materials.Nitrogen, 2), + new MaterialStack(Materials.Oxygen, 6)) + .constructMaterial(); // Co(NO3)2 public static Materials OrganorhodiumCatalyst = new MaterialBuilder( - 756, - TextureSet.SET_POWDER, - "Organorhodium Catalyst").setName("OrganorhodiumCatalyst") - .addDustItems() - .setRGB(170, 0, 0) - .setColor(Dyes.dyeRed) - .setMeltingPoint(373) - .setMaterialList( - new MaterialStack(Materials.Cobalt, 1), - new MaterialStack(Materials.NitricAcid, 2)) - .constructMaterial(); // RhHCO(P(C6H5)3)3 - public static Materials SodiumBorohydride = new MaterialBuilder( - 755, - TextureSet.SET_POWDER, - "Sodium Borohydride").setName("SodiumBorohydride") - .addDustItems() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(673) - .setMaterialList( - new MaterialStack(Materials.Sodium, 1), - new MaterialStack(Materials.Boron, 1), - new MaterialStack(Materials.Hydrogen, 4)) - .constructMaterial(); // NaBH4 - public static Materials RhodiumChloride = new MaterialBuilder( - 754, - TextureSet.SET_POWDER, - "Rhodium Chloride").setName("RhodiumChloride") - .addDustItems() - .setRGB(128, 0, 0) - .setColor(Dyes.dyeRed) - .setMeltingPoint(723) - .constructMaterial(); // RHCL3 - public static Materials Triphenylphosphene = new MaterialBuilder( - 753, - TextureSet.SET_POWDER, - "Triphenylphosphine").setName("Triphenylphosphene") - .addDustItems() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(353) - .setMaterialList( - new MaterialStack(Materials.Carbon, 18L), - new MaterialStack(Materials.Hydrogen, 15L), - new MaterialStack(Materials.Phosphorus, 1L)) - .constructMaterial(); // C18H15P + 756, + TextureSet.SET_POWDER, + "Organorhodium Catalyst").setName("OrganorhodiumCatalyst") + .addDustItems() + .setRGB(170, 0, 0) + .setColor(Dyes.dyeRed) + .setMeltingPoint(373) + .setMaterialList(new MaterialStack(Materials.Cobalt, 1), new MaterialStack(Materials.NitricAcid, 2)) + .constructMaterial(); // RhHCO(P(C6H5)3)3 + public static Materials SodiumBorohydride = new MaterialBuilder(755, TextureSet.SET_POWDER, "Sodium Borohydride") + .setName("SodiumBorohydride") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(673) + .setMaterialList( + new MaterialStack(Materials.Sodium, 1), + new MaterialStack(Materials.Boron, 1), + new MaterialStack(Materials.Hydrogen, 4)) + .constructMaterial(); // NaBH4 + public static Materials RhodiumChloride = new MaterialBuilder(754, TextureSet.SET_POWDER, "Rhodium Chloride") + .setName("RhodiumChloride") + .addDustItems() + .setRGB(128, 0, 0) + .setColor(Dyes.dyeRed) + .setMeltingPoint(723) + .constructMaterial(); // RHCL3 + public static Materials Triphenylphosphene = new MaterialBuilder(753, TextureSet.SET_POWDER, "Triphenylphosphine") + .setName("Triphenylphosphene") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(353) + .setMaterialList( + new MaterialStack(Materials.Carbon, 18L), + new MaterialStack(Materials.Hydrogen, 15L), + new MaterialStack(Materials.Phosphorus, 1L)) + .constructMaterial(); // C18H15P public static Materials PhosphorusTrichloride = new MaterialBuilder( - 752, - TextureSet.SET_FLUID, - "Phosphorus Trichloride").setName("PhosphorusTrichloride") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(179) - .setMaterialList( - new MaterialStack(Materials.Phosphorus, 1L), - new MaterialStack(Materials.Chlorine, 3L)) - .constructMaterial(); // PCL3 - public static Materials SodiumHydride = new MaterialBuilder( - 751, - TextureSet.SET_POWDER, - "Sodium Hydride").setName("SodiumHydride") - .addDustItems() - .setRGB(192, 192, 192) - .setColor(Dyes.dyeLightGray) - .setMeltingPoint(911) - .setMaterialList( - new MaterialStack(Materials.Sodium, 1L), - new MaterialStack(Materials.Hydrogen, 1L)) - .constructMaterial(); // NaH - public static Materials TrimethylBorate = new MaterialBuilder( - 750, - TextureSet.SET_FLUID, - "Trimethyl Borate").setName("TrimethylBorate") - .addCell() - .addFluid() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(239) - .setMaterialList( - new MaterialStack(Materials.Carbon, 3L), - new MaterialStack(Materials.Hydrogen, 9L), - new MaterialStack(Materials.Boron, 1L), - new MaterialStack(Materials.Oxygen, 3L)) - .constructMaterial(); // C3H9BO3 - public static Materials SodiumMethoxide = new MaterialBuilder( - 749, - TextureSet.SET_POWDER, - "Sodium Methoxide").setName("SodiumMethoxide") - .addDustItems() - .setRGB(255, 255, 255) - .setColor(Dyes.dyeWhite) - .setMeltingPoint(400) - .setMaterialList( - new MaterialStack(Materials.Carbon, 1L), - new MaterialStack(Materials.Hydrogen, 3L), - new MaterialStack(Materials.Oxygen, 1L), - new MaterialStack(Materials.Sodium, 1L)) - .constructMaterial(); // CH3NaO + 752, + TextureSet.SET_FLUID, + "Phosphorus Trichloride").setName("PhosphorusTrichloride") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(179) + .setMaterialList(new MaterialStack(Materials.Phosphorus, 1L), new MaterialStack(Materials.Chlorine, 3L)) + .constructMaterial(); // PCL3 + public static Materials SodiumHydride = new MaterialBuilder(751, TextureSet.SET_POWDER, "Sodium Hydride") + .setName("SodiumHydride") + .addDustItems() + .setRGB(192, 192, 192) + .setColor(Dyes.dyeLightGray) + .setMeltingPoint(911) + .setMaterialList(new MaterialStack(Materials.Sodium, 1L), new MaterialStack(Materials.Hydrogen, 1L)) + .constructMaterial(); // NaH + public static Materials TrimethylBorate = new MaterialBuilder(750, TextureSet.SET_FLUID, "Trimethyl Borate") + .setName("TrimethylBorate") + .addCell() + .addFluid() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(239) + .setMaterialList( + new MaterialStack(Materials.Carbon, 3L), + new MaterialStack(Materials.Hydrogen, 9L), + new MaterialStack(Materials.Boron, 1L), + new MaterialStack(Materials.Oxygen, 3L)) + .constructMaterial(); // C3H9BO3 + public static Materials SodiumMethoxide = new MaterialBuilder(749, TextureSet.SET_POWDER, "Sodium Methoxide") + .setName("SodiumMethoxide") + .addDustItems() + .setRGB(255, 255, 255) + .setColor(Dyes.dyeWhite) + .setMeltingPoint(400) + .setMaterialList( + new MaterialStack(Materials.Carbon, 1L), + new MaterialStack(Materials.Hydrogen, 3L), + new MaterialStack(Materials.Oxygen, 1L), + new MaterialStack(Materials.Sodium, 1L)) + .constructMaterial(); // CH3NaO // H3RhCl6 diff --git a/src/main/java/gregtech/api/enums/MaterialsOreAlum.java b/src/main/java/gregtech/api/enums/MaterialsOreAlum.java index 12c03396fc..270d794f94 100644 --- a/src/main/java/gregtech/api/enums/MaterialsOreAlum.java +++ b/src/main/java/gregtech/api/enums/MaterialsOreAlum.java @@ -2,89 +2,73 @@ package gregtech.api.enums; public class MaterialsOreAlum { - public static Materials BauxiteSlurry = new MaterialBuilder( - 409, - TextureSet.SET_FLUID, - "Bauxite Slurry").setName("BauxiteSlurry") - .addCell() - .addFluid() - .setRGB(37, 67, 168) - .setMeltingPoint(295) - .setColor(Dyes.dyeBlue) - .constructMaterial(); + public static Materials BauxiteSlurry = new MaterialBuilder(409, TextureSet.SET_FLUID, "Bauxite Slurry") + .setName("BauxiteSlurry") + .addCell() + .addFluid() + .setRGB(37, 67, 168) + .setMeltingPoint(295) + .setColor(Dyes.dyeBlue) + .constructMaterial(); public static Materials HeatedBauxiteSlurry = new MaterialBuilder( - 410, - TextureSet.SET_FLUID, - "Heated Bauxite Slurry").setName("HeadedBauxiteSlurry") - .addCell() - .addFluid() - .setRGB(55, 92, 212) - .setLiquidTemperature(533) - .setMeltingPoint(295) - .setColor(Dyes.dyeBlue) - .constructMaterial(); - public static Materials SluiceJuice = new MaterialBuilder( - 411, - TextureSet.SET_FLUID, - "Sluice Juice").setName("SluiceJuice") - .addCell() - .addFluid() - .setRGB(92, 60, 36) - .setLiquidTemperature(295) - .setMeltingPoint(295) - .setColor(Dyes.dyeGray) - .constructMaterial(); - public static Materials SluiceSand = new MaterialBuilder( - 412, - TextureSet.SET_FINE, - "Sluice Sand").setName("SluiceSand") - .addDustItems() - .setRGB(165, 165, 120) - .setColor(Dyes.dyeGray) - .constructMaterial(); - public static Materials BauxiteSlag = new MaterialBuilder( - 413, - TextureSet.SET_FINE, - "Bauxite Slag").setName("BauxiteSlag") - .addDustItems() - .setRGB(110, 31, 31) - .setColor(Dyes.dyeRed) - .constructMaterial(); - public static Materials IlmeniteSlag = new MaterialBuilder( - 414, - TextureSet.SET_FINE, - "Ilmenite Slag").setName("IlmeniteSlag") - .addDustItems() - .setRGB(163, 38, 38) - .setColor(Dyes.dyeBrown) - .constructMaterial(); - public static Materials GreenSapphireJuice = new MaterialBuilder( - 415, - TextureSet.SET_FLUID, - "Green Sapphire Juice").setName("GreenSapphireJuice") - .addCell() - .addFluid() - .setRGB(100, 200, 130) - .setColor(Dyes.dyeGreen) - .constructMaterial(); - public static Materials SapphireJuice = new MaterialBuilder( - 416, - TextureSet.SET_FLUID, - "Sapphire Juice").setName("SapphireJuice") - .addCell() - .addFluid() - .setRGB(100, 100, 200) - .setColor(Dyes.dyeBlue) - .constructMaterial(); - public static Materials RubyJuice = new MaterialBuilder( - 417, - TextureSet.SET_FLUID, - "Ruby Juice").setName("RubyJuice") - .addCell() - .addFluid() - .setRGB(255, 100, 100) - .setColor(Dyes.dyeRed) - .constructMaterial(); + 410, + TextureSet.SET_FLUID, + "Heated Bauxite Slurry").setName("HeadedBauxiteSlurry") + .addCell() + .addFluid() + .setRGB(55, 92, 212) + .setLiquidTemperature(533) + .setMeltingPoint(295) + .setColor(Dyes.dyeBlue) + .constructMaterial(); + public static Materials SluiceJuice = new MaterialBuilder(411, TextureSet.SET_FLUID, "Sluice Juice") + .setName("SluiceJuice") + .addCell() + .addFluid() + .setRGB(92, 60, 36) + .setLiquidTemperature(295) + .setMeltingPoint(295) + .setColor(Dyes.dyeGray) + .constructMaterial(); + public static Materials SluiceSand = new MaterialBuilder(412, TextureSet.SET_FINE, "Sluice Sand") + .setName("SluiceSand") + .addDustItems() + .setRGB(165, 165, 120) + .setColor(Dyes.dyeGray) + .constructMaterial(); + public static Materials BauxiteSlag = new MaterialBuilder(413, TextureSet.SET_FINE, "Bauxite Slag") + .setName("BauxiteSlag") + .addDustItems() + .setRGB(110, 31, 31) + .setColor(Dyes.dyeRed) + .constructMaterial(); + public static Materials IlmeniteSlag = new MaterialBuilder(414, TextureSet.SET_FINE, "Ilmenite Slag") + .setName("IlmeniteSlag") + .addDustItems() + .setRGB(163, 38, 38) + .setColor(Dyes.dyeBrown) + .constructMaterial(); + public static Materials GreenSapphireJuice = new MaterialBuilder(415, TextureSet.SET_FLUID, "Green Sapphire Juice") + .setName("GreenSapphireJuice") + .addCell() + .addFluid() + .setRGB(100, 200, 130) + .setColor(Dyes.dyeGreen) + .constructMaterial(); + public static Materials SapphireJuice = new MaterialBuilder(416, TextureSet.SET_FLUID, "Sapphire Juice") + .setName("SapphireJuice") + .addCell() + .addFluid() + .setRGB(100, 100, 200) + .setColor(Dyes.dyeBlue) + .constructMaterial(); + public static Materials RubyJuice = new MaterialBuilder(417, TextureSet.SET_FLUID, "Ruby Juice") + .setName("RubyJuice") + .addCell() + .addFluid() + .setRGB(255, 100, 100) + .setColor(Dyes.dyeRed) + .constructMaterial(); /** * called by Materials. Can be safely called multiple times. exists to allow Materials ensure this class is diff --git a/src/main/java/gregtech/api/enums/Mods.java b/src/main/java/gregtech/api/enums/Mods.java index fa0b9ed910..cb380cca48 100644 --- a/src/main/java/gregtech/api/enums/Mods.java +++ b/src/main/java/gregtech/api/enums/Mods.java @@ -302,7 +302,7 @@ public enum Mods { public String getResourcePath(String... path) { return this.getResourceLocation(path) - .toString(); + .toString(); } public ResourceLocation getResourceLocation(String... path) { diff --git a/src/main/java/gregtech/api/enums/OrePrefixes.java b/src/main/java/gregtech/api/enums/OrePrefixes.java index 8d3201f6ca..3e5f694d2a 100644 --- a/src/main/java/gregtech/api/enums/OrePrefixes.java +++ b/src/main/java/gregtech/api/enums/OrePrefixes.java @@ -27,310 +27,310 @@ public enum OrePrefixes { @Deprecated pulp("Pulps", "", "", false, false, false, false, false, false, false, false, false, false, - B[0] | B[1] | B[2] | B[3], -1, 64, -1), + B[0] | B[1] | B[2] | B[3], -1, 64, -1), @Deprecated leaves("Leaves", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), @Deprecated sapling("Saplings", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), @Deprecated itemDust("Dusts", "", "", false, false, false, false, false, false, false, false, false, false, - B[0] | B[1] | B[2] | B[3], -1, 64, -1), + B[0] | B[1] | B[2] | B[3], -1, 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreBlackgranite("Black Granite Ores", "Granite ", " Ore", true, true, false, false, false, true, false, false, - false, true, B[3], -1, 64, -1), + false, true, B[3], -1, 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreRedgranite("Red Granite Ores", "Granite ", " Ore", true, true, false, false, false, true, false, false, false, - true, B[3], -1, 64, -1), + true, B[3], -1, 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreMarble("Marble Ores", "Marble ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreBasalt("Basalt Ores", "Basalt ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), /** Prefix of the Nether-Ores Mod. Causes Ores to double. Ore -> Material is a Oneway Operation! */ oreNetherrack("Netherrack Ores", "Nether ", " Ore", true, true, false, false, false, true, false, false, false, - true, B[3], -1, 64, -1), + true, B[3], -1, 64, -1), /** Prefix of the Nether-Ores Mod. Causes Ores to double. Ore -> Material is a Oneway Operation! */ oreNether("Nether Ores", "Nether ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), @Deprecated denseore("Dense Ores", "", "", false, false, false, false, false, true, false, false, false, true, B[3], -1, 64, - -1), + -1), /** Prefix of the Dense-Ores Mod. Causes Ores to double. Ore -> Material is a Oneway Operation! */ oreDense("Dense Ores", "Dense ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, - 64, -1), + 64, -1), /** Prefix of TFC */ oreRich("Rich Ores", "Rich ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, - 64, -1), + 64, -1), /** Prefix of TFC */ oreNormal("Normal Ores", "Normal ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), /** Prefix of Railcraft. */ oreSmall("Small Ores", "Small ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, - 64, 67), + 64, 67), /** Prefix of Railcraft. */ orePoor("Poor Ores", "Poor ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, - 64, -1), + 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreEndstone("Endstone Ores", "End ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), /** In case of an End-Ores Mod. Ore -> Material is a Oneway Operation! */ oreEnd("End Ores", "End ", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, 64, - -1), + -1), @Deprecated oreGem("Ores", "", "", false, false, false, false, false, true, false, false, false, true, B[3], -1, 64, -1), /** Regular Ore Prefix. Ore -> Material is a Oneway Operation! Introduced by Eloraam */ ore("Ores", "", " Ore", true, true, false, false, false, true, false, false, false, true, B[3], -1, 64, 68), crushedCentrifuged("Centrifuged Ores", "Centrifuged ", " Ore", true, true, false, false, false, false, false, true, - false, true, B[3], -1, 64, 7), + false, true, B[3], -1, 64, 7), crushedPurified("Purified Ores", "Purified ", " Ore", true, true, false, false, false, false, false, true, false, - true, B[3], -1, 64, 6), + true, B[3], -1, 64, 6), crushed("Crushed Ores", "Crushed ", " Ore", true, true, false, false, false, false, false, true, false, true, B[3], - -1, 64, 5), + -1, 64, 5), /** Introduced by Mekanism */ shard("Crystallised Shards", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1, - 64, -1), + 64, -1), clump("Clumps", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1, 64, -1), reduced("Reduced Gravels", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1, 64, - -1), + -1), crystalline("Crystallised Metals", "", "", true, true, false, false, false, false, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), cleanGravel("Clean Gravels", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1, - 64, -1), + 64, -1), dirtyGravel("Dirty Gravels", "", "", true, true, false, false, false, false, false, false, false, true, B[3], -1, - 64, -1), + 64, -1), /** A quintuple Ingot. */ ingotQuintuple("5x Ingots", "Quintuple ", " Ingot", true, true, false, false, false, false, true, true, false, - false, B[1], M * 5, 64, 16), + false, B[1], M * 5, 64, 16), /** A quadruple Ingot. */ ingotQuadruple("4x Ingots", "Quadruple ", " Ingot", true, true, false, false, false, false, true, true, false, - false, B[1], M * 4, 64, 15), + false, B[1], M * 4, 64, 15), @Deprecated ingotQuad("4x Ingots", "Quadruple ", " Ingot", false, false, false, false, false, false, false, false, false, false, - B[1], -1, 64, 15), + B[1], -1, 64, 15), /** A triple Ingot. */ ingotTriple("3x Ingots", "Triple ", " Ingot", true, true, false, false, false, false, true, false, false, false, - B[1], M * 3, 64, 14), + B[1], M * 3, 64, 14), /** A double Ingot. Introduced by TerraFirmaCraft */ ingotDouble("2x Ingots", "Double ", " Ingot", true, true, false, false, false, false, true, true, false, false, - B[1], M * 2, 64, 13), + B[1], M * 2, 64, 13), /** A hot Ingot, which has to be cooled down by a Vacuum Freezer. */ ingotHot("Hot Ingots", "Hot ", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], - M * 1, 64, 12), + M * 1, 64, 12), /** A regular Ingot. Introduced by Eloraam */ ingot("Ingots", "", " Ingot", true, true, false, false, false, false, false, true, false, false, B[1], M * 1, 64, - 11), + 11), /** A regular Gem worth one small Dust. Introduced by TerraFirmaCraft */ gemChipped("Chipped Gemstones", "Chipped ", "", true, true, true, false, false, false, true, true, false, false, - B[2], M / 4, 64, 59), + B[2], M / 4, 64, 59), /** A regular Gem worth two small Dusts. Introduced by TerraFirmaCraft */ gemFlawed("Flawed Gemstones", "Flawed ", "", true, true, true, false, false, false, true, true, false, false, B[2], - M / 2, 64, 60), + M / 2, 64, 60), /** A regular Gem worth two Dusts. Introduced by TerraFirmaCraft */ gemFlawless("Flawless Gemstones", "Flawless ", "", true, true, true, false, false, false, true, true, false, false, - B[2], M * 2, 64, 61), + B[2], M * 2, 64, 61), /** A regular Gem worth four Dusts. Introduced by TerraFirmaCraft */ gemExquisite("Exquisite Gemstones", "Exquisite ", "", true, true, true, false, false, false, true, true, false, - false, B[2], M * 4, 64, 62), + false, B[2], M * 4, 64, 62), /** A regular Gem worth one Dust. Introduced by Eloraam */ gem("Gemstones", "", "", true, true, true, false, false, false, true, true, false, false, B[2], M * 1, 64, 8), @Deprecated dustDirty("Impure Dusts", "", "", false, false, false, false, false, false, false, false, false, true, B[3], -1, 64, - 3), + 3), /** 1/9th of a Dust. */ 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), + B[0] | B[1] | B[2] | B[3], M / 9, 64, 0), /** 1/4th 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), + false, B[0] | B[1] | B[2] | B[3], M / 4, 64, 1), /** Dust with impurities. 1 Unit of Main Material and 1/9 - 1/4 Unit of secondary Material */ dustImpure("Impure Dusts", "Impure Pile of ", " Dust", true, true, false, false, false, false, false, true, false, - true, B[3], M * 1, 64, 3), + true, B[3], M * 1, 64, 3), dustRefined("Refined Dusts", "Refined Pile of ", " Dust", true, true, false, false, false, false, false, true, - false, true, B[3], M * 1, 64, 2), + 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), + true, B[3], M * 1, 64, 4), /** Pure Dust worth of one Ingot or Gem. Introduced by Alblaka. */ 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), + B[0] | B[1] | B[2] | B[3], M * 1, 64, 2), /** A Nugget. Introduced by Eloraam */ nugget("Nuggets", "", " Nugget", true, true, false, false, false, false, false, true, false, false, B[1], M / 9, 64, - 9), + 9), /** Special Alloys have this prefix. */ plateAlloy("Alloy Plates", "", "", true, false, false, false, false, false, false, false, false, false, B[1], -1, - 64, 17), + 64, 17), plateSteamcraft("Steamcraft Plates", "", "", false, false, false, false, false, false, false, false, false, false, - B[1], -1, 64, 17), + B[1], -1, 64, 17), /** 9 Plates combined in one Item. */ plateDense("Dense Plates", "Dense ", " Plate", true, true, false, false, false, false, true, true, false, false, - B[1], M * 9, 64, 22), + B[1], M * 9, 64, 22), plateQuintuple("5x Plates", "Quintuple ", " Plate", true, true, false, false, false, false, true, true, false, - false, B[1], M * 5, 64, 21), + false, B[1], M * 5, 64, 21), plateQuadruple("4x Plates", "Quadruple ", " Plate", true, true, false, false, false, false, true, true, false, - false, B[1], M * 4, 64, 20), + false, B[1], M * 4, 64, 20), @Deprecated plateQuad("4x Plates", "", "", false, false, false, false, false, false, false, false, false, false, B[1], -1, 64, - 20), + 20), plateTriple("3x Plates", "Triple ", " Plate", true, true, false, false, false, false, true, true, false, false, - B[1], M * 3, 64, 19), + B[1], M * 3, 64, 19), plateDouble("2x Plates", "Double ", " Plate", true, true, false, false, false, false, true, true, false, false, - B[1], M * 2, 64, 18), + B[1], M * 2, 64, 18), /** Regular Plate made of one Ingot/Dust. Introduced by Calclavia */ plate("Plates", "", " Plate", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M * 1, - 64, 17), + 64, 17), /** Casing made of 1/2 Ingot/Dust */ itemCasing("Casings", "", " Casing", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], - M / 2, 64, 10), + M / 2, 64, 10), /** Foil made of 1/4 Ingot/Dust. */ foil("Foils", "", " Foil", true, true, false, false, false, false, true, true, false, false, B[1], M / 4, 64, 29), /** Stick made of an Ingot. */ stickLong("Long Sticks/Rods", "Long ", " Rod", true, true, false, false, false, false, true, true, false, false, - B[1] | B[2], M * 1, 64, 54), + B[1] | B[2], M * 1, 64, 54), /** Stick made of half an Ingot. Introduced by Eloraam */ stick("Sticks/Rods", "", " Rod", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], - M / 2, 64, 23), + M / 2, 64, 23), /** consisting out of one Nugget. */ round("Rounds", "", " Round", true, true, false, false, false, false, true, true, false, false, B[1], M / 9, 64, - 25), + 25), /** consisting out of 1/8 Ingot or 1/4 Stick. */ bolt("Bolts", "", " Bolt", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M / 8, 64, - 26), + 26), /** contain dusts */ comb("Combs", "", " Comb", false, false, false, false, false, false, false, true, false, false, B[1] | B[2], M, 64, - 101), + 101), /** consisting out of a Bolt. */ screw("Screws", "", " Screw", true, true, false, false, false, false, true, true, false, false, B[1] | B[2], M / 9, - 64, 27), + 64, 27), /** consisting out of 1/2 Stick. */ ring("Rings", "", " Ring", true, true, false, false, false, false, true, true, false, false, B[1], M / 4, 64, 28), /** consisting out of 1 Fine Wire. */ springSmall("Small Springs", "Small ", " Spring", true, true, false, false, false, false, true, true, false, false, - B[1], M / 4, 64, 55), + B[1], M / 4, 64, 55), /** consisting out of 2 Sticks. */ spring("Springs", "", " Spring", true, true, false, false, false, false, true, true, false, false, B[1], M * 1, 64, - 56), + 56), /** consisting out of 1/8 Ingot or 1/4 Wire. */ wireFine("Fine Wires", "Fine ", " Wire", true, true, false, false, false, false, true, true, false, false, B[1], - M / 8, 64, 51), + M / 8, 64, 51), /** consisting out of 4 Plates, 1 Ring and 1 Screw. */ rotor("Rotors", "", " Rotor", true, true, false, false, false, false, true, true, false, false, B[7], M * 4 + M / 4, - 64, 53), + 64, 53), gearGtSmall("Small Gears", "Small ", " Gear", true, true, false, false, false, false, true, true, false, false, - B[7], M * 1, 64, 52), + B[7], M * 1, 64, 52), /** Introduced by me because BuildCraft has ruined the gear Prefix... */ gearGt("Gears", "", " Gear", true, true, false, false, false, false, true, true, false, false, B[7], M * 4, 16, 63), /** 3/4 of a Plate or Gem used to shape a Lense. Normally only used on Transparent Materials. */ lens("Lenses", "", " Lens", true, true, false, false, false, false, true, true, false, false, B[2], (M * 3) / 4, 64, - 24), + 24), /** consisting out of 16 Dusts. */ crateGtDust("Crates of Dust", "Crate of ", " Dust", true, true, false, true, false, false, false, true, false, - false, B[0] | B[1] | B[2] | B[3], -1, 64, 96), + false, B[0] | B[1] | B[2] | B[3], -1, 64, 96), /** consisting out of 16 Plates. */ crateGtPlate("Crates of Plates", "Crate of ", " Plate", true, true, false, true, false, false, false, true, false, - false, B[1] | B[2], -1, 64, 99), + false, B[1] | B[2], -1, 64, 99), /** consisting out of 16 Ingots. */ crateGtIngot("Crates of Ingots", "Crate of ", " Ingot", true, true, false, true, false, false, false, true, false, - false, B[1], -1, 64, 97), + false, B[1], -1, 64, 97), /** consisting out of 16 Gems. */ crateGtGem("Crates of Gems", "Crate of ", " Gem", true, true, false, true, false, false, false, true, false, false, - B[2], -1, 64, 98), + B[2], -1, 64, 98), /** Hot Cell full of Plasma, which can be used in the Plasma Generator. */ cellPlasma("Cells of Plasma", "", " Plasma Cell", true, true, true, true, false, false, false, true, false, false, - B[5], M * 1, 64, 31), + B[5], M * 1, 64, 31), /** Hot Cell full of molten stuff, which can be used in the Plasma Generator. */ cellMolten("Cells of Molten stuff", "Molten ", " Cell", true, true, true, true, false, false, false, true, false, - false, 0, M * 1, 64, 31), + false, 0, M * 1, 64, 31), /** Regular Gas/Fluid Cell. Introduced by Calclavia */ cell("Cells", "", " Cell", true, true, true, true, false, false, true, true, false, false, B[4] | B[8], M * 1, 64, - 30), + 30), /** A vanilla Iron Bucket filled with the Material. */ bucket("Buckets", "", " Bucket", true, true, true, true, false, false, true, false, false, false, B[4] | B[8], - M * 1, 64, -1), + M * 1, 64, -1), /** An Iguana Tweaks Clay Bucket filled with the Material. */ bucketClay("Clay Buckets", "", " Clay Bucket", true, true, true, true, false, false, true, false, false, false, - B[4] | B[8], M * 1, 64, -1), + B[4] | B[8], M * 1, 64, -1), /** Glass Bottle containing a Fluid. */ bottle("Bottles", "", " Bottle", true, true, true, true, false, false, false, false, false, false, B[4] | B[8], -1, - 64, -1), + 64, -1), capsule("Capsules", "", " Capsule", false, true, true, true, false, false, false, false, false, false, B[4] | B[8], - M * 1, 64, -1), + M * 1, 64, -1), crystal("Crystals", "", " Crystal", false, true, false, false, false, false, true, false, false, false, B[2], M * 1, - 64, -1), + 64, -1), bulletGtSmall("Small Bullets", "Small ", " Bullet", true, true, false, false, true, false, true, false, true, false, - B[6] | B[8], M / 9, 64, -1), + B[6] | B[8], M / 9, 64, -1), bulletGtMedium("Medium Bullets", "Medium ", " Bullet", true, true, false, false, true, false, true, false, true, - false, B[6] | B[8], M / 6, 64, -1), + false, B[6] | B[8], M / 6, 64, -1), bulletGtLarge("Large Bullets", "Large ", " Bullet", true, true, false, false, true, false, true, false, true, false, - B[6] | B[8], M / 3, 64, -1), + B[6] | B[8], M / 3, 64, -1), /** Arrow made of 1/4 Ingot/Dust + Wooden Stick. */ arrowGtWood("Regular Arrows", "", " Arrow", true, true, false, false, true, false, true, false, true, false, B[6], - M / 4, 64, 57), + M / 4, 64, 57), /** Arrow made of 1/4 Ingot/Dust + Plastic Stick. */ arrowGtPlastic("Light Arrows", "Light ", " Arrow", true, true, false, false, true, false, true, false, true, false, - B[6], M / 4, 64, 58), + B[6], M / 4, 64, 58), arrow("Arrows", "", "", false, false, true, false, false, false, false, false, true, false, B[6], -1, 64, 57), /** consisting out of 1/4 Ingot. */ toolHeadArrow("Arrow Heads", "", " Arrow Head", true, true, false, false, false, false, true, true, false, false, - B[6], M / 4, 64, 46), + B[6], M / 4, 64, 46), /** consisting out of 2 Ingots. */ toolHeadSword("Sword Blades", "", " Sword Blade", true, true, false, false, false, false, true, true, false, false, - B[6], M * 2, 64, 32), + B[6], M * 2, 64, 32), /** consisting out of 3 Ingots. */ toolHeadPickaxe("Pickaxe Heads", "", " Pickaxe Head", true, true, false, false, false, false, true, true, false, - false, B[6], M * 3, 64, 33), + false, B[6], M * 3, 64, 33), /** consisting out of 1 Ingots. */ toolHeadShovel("Shovel Heads", "", " Shovel Head", true, true, false, false, false, false, true, true, false, false, - B[6], M * 1, 64, 34), + B[6], M * 1, 64, 34), /** consisting out of 1 Ingots. */ toolHeadUniversalSpade("Universal Spade Heads", "", " Universal Spade Head", true, true, false, false, false, false, - true, true, false, false, B[6], M * 1, 64, 43), + true, true, false, false, B[6], M * 1, 64, 43), /** consisting out of 3 Ingots. */ toolHeadAxe("Axe Heads", "", " Axe Head", true, true, false, false, false, false, true, true, false, false, B[6], - M * 3, 64, 35), + M * 3, 64, 35), /** consisting out of 2 Ingots. */ toolHeadHoe("Hoe Heads", "", " Hoe Head", true, true, false, false, false, false, true, true, false, false, B[6], - M * 2, 64, 36), + M * 2, 64, 36), /** consisting out of 3 Ingots. */ toolHeadSense("Sense Blades", "", " Sense Blade", true, true, false, false, false, false, true, true, false, false, - B[6], M * 3, 64, 44), + B[6], M * 3, 64, 44), /** consisting out of 2 Ingots. */ toolHeadFile("File Heads", "", " File Head", true, true, false, false, false, false, true, true, false, false, B[6], - M * 2, 64, 38), + M * 2, 64, 38), /** consisting out of 6 Ingots. */ toolHeadHammer("Hammer Heads", "", " Hammer Head", true, true, false, false, false, false, true, true, false, false, - B[6], M * 6, 64, 37), + B[6], M * 6, 64, 37), /** consisting out of 4 Ingots. */ toolHeadPlow("Plow Heads", "", " Plow Head", true, true, false, false, false, false, true, true, false, false, B[6], - M * 4, 64, 45), + M * 4, 64, 45), /** consisting out of 2 Ingots. */ toolHeadSaw("Saw Blades", "", " Saw Blade", true, true, false, false, false, false, true, true, false, false, B[6], - M * 2, 64, 39), + M * 2, 64, 39), /** consisting out of 4 Ingots. */ toolHeadBuzzSaw("Buzzsaw Blades", "", " Buzzsaw Blade", true, true, false, false, false, false, true, true, false, - false, B[6], M * 4, 64, 48), + false, B[6], M * 4, 64, 48), /** consisting out of 1 Ingots. */ toolHeadScrewdriver("Screwdriver Tips", "", " Screwdriver Tip", true, true, false, false, false, false, true, false, - false, false, B[6], M * 1, 64, 47), + false, false, B[6], M * 1, 64, 47), /** consisting out of 4 Ingots. */ toolHeadDrill("Drill Tips", "", " Drill Tip", true, true, false, false, false, false, true, true, false, false, - B[6], M * 4, 64, 40), + B[6], M * 4, 64, 40), /** consisting out of 2 Ingots. */ toolHeadChainsaw("Chainsaw Tips", "", " Chainsaw Tip", true, true, false, false, false, false, true, true, false, - false, B[6], M * 2, 64, 41), + false, B[6], M * 2, 64, 41), /** consisting out of 4 Ingots. */ toolHeadWrench("Wrench Tips", "", " Wrench Tip", true, true, false, false, false, false, true, true, false, false, - B[6], M * 4, 64, 42), + B[6], M * 4, 64, 42), /** consisting out of 6 Ingots. */ turbineBlade("Turbine Blades", "", " Turbine Blade", true, true, false, false, false, false, true, true, false, - false, B[6], M * 6, 64, 100), + false, B[6], M * 6, 64, 100), /** vanilly Sword */ toolSword("Swords", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 2, 1, -1), /** vanilly Pickaxe */ toolPickaxe("Pickaxes", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 3, 1, - -1), + -1), /** vanilly Shovel */ toolShovel("Shovels", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 1, 1, - -1), + -1), /** vanilly Axe */ toolAxe("Axes", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 3, 1, -1), /** vanilly Hoe */ @@ -343,37 +343,37 @@ public enum OrePrefixes { */ tool("Tools", "", "", false, false, false, false, false, false, false, false, true, false, B[6], -1, 1, -1), compressedCobblestone("9^X Compressed Cobblestones", "", "", false, false, false, false, false, false, false, false, - false, false, 0, -1, 64, -1), + false, false, 0, -1, 64, -1), compressedStone("9^X Compressed Stones", "", "", false, false, false, false, false, false, false, false, false, - false, 0, -1, 64, -1), + false, 0, -1, 64, -1), compressedDirt("9^X Compressed Dirt", "", "", false, false, false, false, false, false, false, false, false, false, - 0, -1, 64, -1), + 0, -1, 64, -1), compressedGravel("9^X Compressed Gravel", "", "", false, false, false, false, false, false, false, false, false, - false, 0, -1, 64, -1), + false, 0, -1, 64, -1), compressedSand("9^X Compressed Sand", "", "", false, false, false, false, false, false, false, false, false, false, - 0, -1, 64, -1), + 0, -1, 64, -1), /** Compressed Material, worth 1 Unit. Introduced by Galacticraft */ compressed("Compressed Materials", "Compressed ", "", true, true, false, false, false, false, true, false, false, - false, 0, M * 3, 64, -1), + false, 0, M * 3, 64, -1), glass("Glasses", "", "", false, false, true, false, true, false, false, false, false, false, 0, -1, 64, -1), paneGlass("Glass Panes", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, -1), blockGlass("Glass Blocks", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), blockWool("Wool Blocks", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, -1), /** IGNORE */ block_("Random Blocks", "", "", false, false, false, false, false, true, false, false, false, false, 0, -1, 64, -1), /** Storage Block consisting out of 9 Ingots/Gems/Dusts. Introduced by CovertJaguar */ block("Storage Blocks", "Block of ", "", true, true, false, false, false, true, true, false, false, false, 0, M * 9, - 64, 71), + 64, 71), /** Special Prefix used mainly for the Crafting Handler. */ craftingTool("Crafting Tools", "", "", false, false, false, false, false, false, false, false, true, false, 0, -1, - 64, -1), + 64, -1), /** Special Prefix used mainly for the Crafting Handler. */ crafting("Crafting Ingredients", "", "", false, false, false, false, false, false, false, false, false, false, 0, - -1, 64, -1), + -1, 64, -1), /** Special Prefix used mainly for the Crafting Handler. */ craft("Crafting Stuff?", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), /** Prefix used for Logs. Usually as "logWood". Introduced by Eloraam */ log("Logs", "", "", false, false, false, false, false, true, false, false, false, false, 0, -1, 64, -1), /** Prefix used for Slabs. Usually as "slabWood" or "slabStone". Introduced by SirSengir */ @@ -392,35 +392,35 @@ public enum OrePrefixes { tree("Tree Parts", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), /** Cobblestone Prefix for all Cobblestones. */ stoneCobble("Cobblestones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), /** Smoothstone Prefix. */ stoneSmooth("Smoothstones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), /** Mossy Stone Bricks. */ stoneMossyBricks("mossy Stone Bricks", "", "", false, false, true, false, false, true, false, false, false, false, - 0, -1, 64, -1), + 0, -1, 64, -1), /** Mossy Cobble. */ stoneMossy("Mossy Stones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), @Deprecated stoneBricksMossy("Mossy Stone Bricks", "", "", false, false, false, false, false, true, false, false, false, false, - 0, -1, 64, -1), + 0, -1, 64, -1), /** Stone Bricks. */ stoneBricks("Stone Bricks", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), @Deprecated stoneBrick("Stone Bricks", "", "", false, false, false, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), /** Cracked Bricks. */ stoneCracked("Cracked Stones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, - 64, -1), + 64, -1), /** Chiseled Stone. */ stoneChiseled("Chiseled Stones", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, - 64, -1), + 64, -1), /** Prefix to determine which kind of Rock this is. */ stone("Stones", "", "", false, true, true, false, true, true, false, false, false, false, 0, -1, 64, -1), cobblestone("Cobblestones", "", "", false, true, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), /** Prefix to determine which kind of Rock this is. */ rock("Rocks", "", "", false, true, true, false, true, true, false, false, false, false, 0, -1, 64, -1), record("Records", "", "", false, false, true, false, false, false, false, false, false, false, 0, -1, 1, -1), @@ -439,69 +439,69 @@ public enum OrePrefixes { dye("Dyes", "", "", false, false, true, false, false, false, false, false, false, false, 0, -1, 64, -1), /** Used for the 16 colors of Stained Clay. Introduced by Forge */ stainedClay("Stained Clays", "", "", false, false, true, false, false, true, false, false, false, false, 0, -1, 64, - -1), + -1), /** vanilly Helmet */ armorHelmet("Helmets", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 5, 1, - -1), + -1), /** vanilly Chestplate */ armorChestplate("Chestplates", "", "", false, true, false, false, false, false, true, false, true, false, B[6], - M * 8, 1, -1), + M * 8, 1, -1), /** vanilly Pants */ armorLeggings("Leggings", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 7, 1, - -1), + -1), /** vanilly Boots */ armorBoots("Boots", "", "", false, true, false, false, false, false, true, false, true, false, B[6], M * 4, 1, -1), armor("Armor Parts", "", "", false, false, false, false, false, false, false, false, true, false, B[6], -1, 1, -1), frameGt("Frame Boxes", "", "", true, true, false, false, true, false, true, false, false, false, 0, M * 2, 64, 83), pipeTiny("Tiny Pipes", "Tiny ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, M / 2, - 64, 78), + 64, 78), pipeSmall("Small Pipes", "Small ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, - M * 1, 64, 79), + M * 1, 64, 79), pipeMedium("Medium Pipes", "Medium ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, - M * 3, 64, 80), + M * 3, 64, 80), pipeLarge("Large pipes", "Large ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, - M * 6, 64, 81), + M * 6, 64, 81), pipeHuge("Huge Pipes", "Huge ", " Pipe", true, true, false, false, true, false, true, false, false, false, 0, - M * 12, 64, 82), + M * 12, 64, 82), pipeQuadruple("Quadruple Pipes", "Quadruple ", " Pipe", true, true, false, false, true, false, true, false, false, - false, 0, M * 12, 64, 84), + false, 0, M * 12, 64, 84), pipeNonuple("Nonuple Pipes", "Nonuple ", " Pipe", true, true, false, false, true, false, true, false, false, false, - 0, M * 9, 64, 85), + 0, M * 9, 64, 85), pipeRestrictiveTiny("Tiny Restrictive Pipes", "Tiny Restrictive ", " Pipe", true, true, false, false, true, false, - true, false, false, false, 0, M / 2, 64, 78), + true, false, false, false, 0, M / 2, 64, 78), pipeRestrictiveSmall("Small Restrictive Pipes", "Small Restrictive ", " Pipe", true, true, false, false, true, - false, true, false, false, false, 0, M * 1, 64, 79), + false, true, false, false, false, 0, M * 1, 64, 79), pipeRestrictiveMedium("Medium Restrictive Pipes", "Medium Restrictive ", " Pipe", true, true, false, false, true, - false, true, false, false, false, 0, M * 3, 64, 80), + false, true, false, false, false, 0, M * 3, 64, 80), pipeRestrictiveLarge("Large Restrictive Pipes", "Large Restrictive ", " Pipe", true, true, false, false, true, - false, true, false, false, false, 0, M * 6, 64, 81), + false, true, false, false, false, 0, M * 6, 64, 81), pipeRestrictiveHuge("Huge Restrictive Pipes", "Huge Restrictive ", " Pipe", true, true, false, false, true, false, - true, false, false, false, 0, M * 12, 64, 82), + true, false, false, false, 0, M * 12, 64, 82), pipe("Pipes", "", " Pipe", true, false, false, false, false, false, false, false, false, false, 0, -1, 64, 77), wireGt16("16x Wires", "16x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 8, - 64, -1), + 64, -1), wireGt12("12x Wires", "12x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 6, - 64, -1), + 64, -1), wireGt08("8x Wires", "8x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 4, - 64, -1), + 64, -1), wireGt04("4x Wires", "4x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 2, - 64, -1), + 64, -1), wireGt02("2x Wires", "2x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M * 1, - 64, -1), + 64, -1), wireGt01("1x Wires", "1x ", " Wire", true, true, false, false, false, false, true, false, false, false, 0, M / 2, - 64, -1), + 64, -1), cableGt16("16x Cables", "16x ", " Cable", true, true, false, false, false, false, true, false, false, false, 0, - M * 8, 64, -1), + M * 8, 64, -1), cableGt12("12x Cables", "12x ", " Cable", true, true, false, false, false, false, true, false, false, false, 0, - M * 6, 64, -1), + M * 6, 64, -1), cableGt08("8x Cables", "8x ", " Cable", true, true, false, false, false, false, true, false, false, false, 0, M * 4, - 64, -1), + 64, -1), cableGt04("4x Cables", "4x ", " Cable", true, true, false, false, false, false, true, false, false, false, 0, M * 2, - 64, -1), + 64, -1), cableGt02("2x Cables", "2x ", " Cable", true, true, false, false, false, false, true, false, false, false, 0, M * 1, - 64, -1), + 64, -1), cableGt01("1x Cables", "1x ", " Cable", true, true, false, false, false, false, true, false, false, false, 0, M / 2, - 64, -1), + 64, -1), /* * Electric Components. usual Materials for this are: Primitive (Tier 1) Basic (Tier 2) as used by UE as well : IC2 @@ -511,10 +511,10 @@ public enum OrePrefixes { * and Lapotronic Energy Orb Infinite (Cheaty) */ batterySingleuse("Single Use Batteries", "", "", false, true, false, false, false, false, false, false, false, - false, 0, -1, 64, -1), + false, 0, -1, 64, -1), /** Introduced by Calclavia */ battery("Reusable Batteries", "", "", false, true, false, false, false, false, false, false, false, false, 0, -1, - 64, -1), + 64, -1), /** Introduced by Calclavia */ circuit("Circuits", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, 64, -1), /** Introduced by Buildcraft */ @@ -527,7 +527,7 @@ public enum OrePrefixes { plating("Platings", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), dinosaur("Dinosaurs", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), travelgear("Travel Gear", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), bauble("Baubles", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), cluster("Clusters", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), grafter("Grafters", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), @@ -553,17 +553,17 @@ public enum OrePrefixes { seed("Seeds", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), reed("Reeds", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), sheetDouble("2x Sheets", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), sheet("Sheets", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), crop("Crops", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), plant("Plants", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), coin("Coins", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), lumar("Lumars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), ground("Grounded Stuff", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), cable("Cables", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), component("Components", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), wax("Waxes", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), wall("Walls", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), tube("Tubes", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), @@ -588,11 +588,11 @@ public enum OrePrefixes { shears("Shears", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), turbine("Turbines", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), fertilizer("Fertilizers", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), chest("Chests", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), raw("Raw Things", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), stainedGlass("Stained Glasses", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, - 64, -1), + 64, -1), mystic("Mystic Stuff", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), mana("Mana Stuff", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), rune("Runes", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), @@ -602,13 +602,13 @@ public enum OrePrefixes { soulsand("Soulsands", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), obsidian("Obsidians", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), glowstone("Glowstones", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), beans("Beans", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), br("br", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), essence("Essences", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), alloy("Alloys", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), cooking("Cooked Things", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, - -1), + -1), elven("Elven Stuff", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), reactor("Reactors", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), mffs("MFFS", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), @@ -619,53 +619,53 @@ public enum OrePrefixes { bar("Bars", "", "", false, false, false, false, false, false, false, false, false, false, 0, -1, 64, -1), /** Reverse Head consisting out of 6 Ingots. */ toolHeadMallet("Mallet Heads", "", " Mallet Head", true, true, false, false, false, false, true, true, false, false, - B[6], M * 6, 64, 127), + B[6], M * 6, 64, 127), /** Reverse Stick made of half an Ingot. Introduced by Eloraam */ handleMallet("Mallet Handle", "", " Handle", true, true, false, false, false, false, true, true, false, false, - B[1] | B[2], M / 2, 64, 126), + B[1] | B[2], M / 2, 64, 126), // Cracked fluids cellHydroCracked1("Cells", "Lightly Hydro-Cracked ", " Cell", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, 30), + false, false, 0, M * 1, 64, 30), cellHydroCracked2("Cells", "Moderately Hydro-Cracked ", " Cell", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, 30), + false, false, 0, M * 1, 64, 30), cellHydroCracked3("Cells", "Severely Hydro-Cracked ", " Cell", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, 30), + false, false, 0, M * 1, 64, 30), cellSteamCracked1("Cells", "Lightly Steam-Cracked ", " Cell", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, 30), + false, false, 0, M * 1, 64, 30), cellSteamCracked2("Cells", "Moderately Steam-Cracked ", " Cell", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, 30), + false, false, 0, M * 1, 64, 30), cellSteamCracked3("Cells", "Severely Steam-Cracked ", " Cell", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, 30), + false, false, 0, M * 1, 64, 30), componentCircuit("Circuit Parts", "", "", true, true, false, false, false, false, false, false, false, false, 0, -1, - 64, -1), + 64, -1), apiaryUpgrade("Industrial Apiary Upgrade", "", "", false, false, true, false, false, false, false, false, false, - false, 0, -1, 64, -1), + false, 0, -1, 64, -1), beeComb("Bee Combs", "", "", true, false, true, false, false, false, false, false, false, false, 0, -1, 64, -1), nanite("Nanites", "", " Nanites", true, true, true, false, false, false, false, false, false, false, 0, -1, 64, 50), // migrated from GT++ milled("Milled Ores", "Milled ", " Ore", true, true, false, false, false, false, false, false, false, true, B[3], - -1, 64, -1), + -1, 64, -1), // migrated from bartworks blockCasing("A Casing block for a Multiblock-Machine", "Bolted ", " Casing", true, true, true, true, false, true, - false, true, false, false, 0, M * 9, 64, -1), + false, true, false, false, 0, M * 9, 64, -1), blockCasingAdvanced("An Advanced Casing block for a Multiblock-Machine", "Rebolted ", " Casing", true, true, true, - true, false, true, false, true, false, false, 0, M * 9, 64, -1), + true, false, true, false, true, false, false, 0, M * 9, 64, -1), capsuleMolten("Capsule of Molten stuff", "Molten ", " Capsule", true, true, true, true, false, false, false, true, - false, false, 0, M * 1, 64, -1); + false, false, 0, M * 1, 64, -1); public static final ImmutableList<OrePrefixes> CELL_TYPES = ImmutableList.of( - cell, - cellMolten, - cellPlasma, - cellHydroCracked1, - cellHydroCracked2, - cellHydroCracked3, - cellSteamCracked1, - cellSteamCracked2, - cellSteamCracked3); + cell, + cellMolten, + cellPlasma, + cellHydroCracked1, + cellHydroCracked2, + cellHydroCracked3, + cellSteamCracked1, + cellSteamCracked2, + cellSteamCracked3); public static volatile int VERSION = 509; @@ -687,16 +687,16 @@ public enum OrePrefixes { cellPlasma.mHeatDamage = 6.0F; block.ignoreMaterials( - Materials.Ice, - Materials.Snow, - Materials.Concrete, - Materials.Glass, - Materials.Glowstone, - Materials.DarkIron, - Materials.Marble, - Materials.Quartz, - Materials.CertusQuartz, - Materials.Limestone); + Materials.Ice, + Materials.Snow, + Materials.Concrete, + Materials.Glass, + Materials.Glowstone, + Materials.DarkIron, + Materials.Marble, + Materials.Quartz, + Materials.CertusQuartz, + Materials.Limestone); ingot.ignoreMaterials(Materials.Brick, Materials.NetherBrick); dust.addFamiliarPrefix(dustTiny); @@ -710,10 +710,9 @@ public enum OrePrefixes { nugget.addFamiliarPrefix(ingot); for (OrePrefixes tPrefix1 : values()) if (tPrefix1.name() - .startsWith("ore")) + .startsWith("ore")) for (OrePrefixes tPrefix2 : values()) if (tPrefix2.name() - .startsWith("ore")) - tPrefix1.addFamiliarPrefix(tPrefix2); + .startsWith("ore")) tPrefix1.addFamiliarPrefix(tPrefix2); // These are only the important ones. gem.mNotGeneratedItems.add(Materials.Coal); @@ -864,66 +863,66 @@ public enum OrePrefixes { // ----- toolHeadFile.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); toolHeadSaw.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); toolHeadDrill.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); toolHeadChainsaw.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); toolHeadWrench.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); toolHeadBuzzSaw.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); turbineBlade.mCondition = new ICondition.And<>( - new ICondition.Not<>(SubTag.NO_SMASHING), - new ICondition.Not<>(SubTag.BOUNCY)); + new ICondition.Not<>(SubTag.NO_SMASHING), + new ICondition.Not<>(SubTag.BOUNCY)); rotor.mCondition = new ICondition.Nor<>(SubTag.CRYSTAL, SubTag.STONE, SubTag.BOUNCY); spring.mCondition = new ICondition.Or<>( - SubTag.STRETCHY, - SubTag.BOUNCY, - new ICondition.Not<>(SubTag.NO_SMASHING)); + SubTag.STRETCHY, + SubTag.BOUNCY, + new ICondition.Not<>(SubTag.NO_SMASHING)); springSmall.mCondition = new ICondition.Or<>( - SubTag.STRETCHY, - SubTag.BOUNCY, - new ICondition.Not<>(SubTag.NO_SMASHING)); + SubTag.STRETCHY, + SubTag.BOUNCY, + new ICondition.Not<>(SubTag.NO_SMASHING)); gemChipped.mCondition = new ICondition.And<>( - SubTag.TRANSPARENT, - SubTag.CRYSTAL, - new ICondition.Not<>(SubTag.QUARTZ), - new ICondition.Not<>(SubTag.PEARL), - new ICondition.Not<>(SubTag.MAGICAL)); + SubTag.TRANSPARENT, + SubTag.CRYSTAL, + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); gemFlawed.mCondition = new ICondition.And<>( - SubTag.TRANSPARENT, - SubTag.CRYSTAL, - new ICondition.Not<>(SubTag.QUARTZ), - new ICondition.Not<>(SubTag.PEARL), - new ICondition.Not<>(SubTag.MAGICAL)); + SubTag.TRANSPARENT, + SubTag.CRYSTAL, + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); gemFlawless.mCondition = new ICondition.And<>( - SubTag.TRANSPARENT, - SubTag.CRYSTAL, - new ICondition.Not<>(SubTag.QUARTZ), - new ICondition.Not<>(SubTag.PEARL), - new ICondition.Not<>(SubTag.MAGICAL)); + SubTag.TRANSPARENT, + SubTag.CRYSTAL, + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); gemExquisite.mCondition = new ICondition.And<>( - SubTag.TRANSPARENT, - SubTag.CRYSTAL, - new ICondition.Not<>(SubTag.QUARTZ), - new ICondition.Not<>(SubTag.PEARL), - new ICondition.Not<>(SubTag.MAGICAL)); + SubTag.TRANSPARENT, + SubTag.CRYSTAL, + new ICondition.Not<>(SubTag.QUARTZ), + new ICondition.Not<>(SubTag.PEARL), + new ICondition.Not<>(SubTag.MAGICAL)); lens.mCondition = new ICondition.Or<>( - SubTag.MAGICAL, - new ICondition.And<>(SubTag.TRANSPARENT, SubTag.HAS_COLOR)); + SubTag.MAGICAL, + new ICondition.And<>(SubTag.TRANSPARENT, SubTag.HAS_COLOR)); plateDouble.mCondition = new ICondition.Or<>(SubTag.PAPER, new ICondition.Not<>(SubTag.NO_SMASHING)); plateTriple.mCondition = new ICondition.Or<>(SubTag.PAPER, new ICondition.Not<>(SubTag.NO_SMASHING)); @@ -954,8 +953,8 @@ public enum OrePrefixes { cableGt01.mSecondaryMaterial = new MaterialStack(Materials.Rubber, plate.mMaterialAmount); bucket.mSecondaryMaterial = new MaterialStack(Materials.Iron, ingot.mMaterialAmount * 3); bucketClay.mSecondaryMaterial = new MaterialStack(Materials.Clay, dust.mMaterialAmount * 5); - CELL_TYPES.forEach( - prefix -> prefix.mSecondaryMaterial = new MaterialStack(Materials.Tin, plate.mMaterialAmount * 2)); + CELL_TYPES + .forEach(prefix -> prefix.mSecondaryMaterial = new MaterialStack(Materials.Tin, plate.mMaterialAmount * 2)); oreRedgranite.mSecondaryMaterial = new MaterialStack(Materials.GraniteRed, dust.mMaterialAmount); oreBlackgranite.mSecondaryMaterial = new MaterialStack(Materials.GraniteBlack, dust.mMaterialAmount); oreNetherrack.mSecondaryMaterial = new MaterialStack(Materials.Netherrack, dust.mMaterialAmount); @@ -973,11 +972,11 @@ public enum OrePrefixes { crushed.mSecondaryMaterial = new MaterialStack(Materials.Stone, dust.mMaterialAmount); toolHeadDrill.mSecondaryMaterial = new MaterialStack(Materials.Steel, plate.mMaterialAmount * 4); toolHeadChainsaw.mSecondaryMaterial = new MaterialStack( - Materials.Steel, - plate.mMaterialAmount * 4 + ring.mMaterialAmount * 2); + Materials.Steel, + plate.mMaterialAmount * 4 + ring.mMaterialAmount * 2); toolHeadWrench.mSecondaryMaterial = new MaterialStack( - Materials.Steel, - ring.mMaterialAmount + screw.mMaterialAmount * 2); + Materials.Steel, + ring.mMaterialAmount + screw.mMaterialAmount * 2); arrowGtWood.mSecondaryMaterial = new MaterialStack(Materials.Wood, stick.mMaterialAmount); arrowGtPlastic.mSecondaryMaterial = new MaterialStack(Materials.Plastic, stick.mMaterialAmount); bulletGtSmall.mSecondaryMaterial = new MaterialStack(Materials.Brass, ingot.mMaterialAmount / 9); @@ -989,7 +988,7 @@ public enum OrePrefixes { public final short mTextureIndex; public final String mRegularLocalName, mLocalizedMaterialPre, mLocalizedMaterialPost; public final boolean mIsUsedForOreProcessing, mIsEnchantable, mIsUnificatable, mIsMaterialBased, mIsSelfReferencing, - mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem; + mIsContainer, mDontUnificateActively, mIsUsedForBlocks, mAllowNormalRecycling, mGenerateDefaultItem; public final List<TC_AspectStack> mAspects = new ArrayList<>(); public final Collection<OrePrefixes> mFamiliarPrefixes = new HashSet<>(); /** @@ -999,7 +998,7 @@ public enum OrePrefixes { public final long mMaterialAmount; public final Collection<Materials> mDisabledItems = new HashSet<>(), mNotGeneratedItems = new HashSet<>(), - mIgnoredMaterials = new HashSet<>(), mGeneratedItems = new HashSet<>(); + mIgnoredMaterials = new HashSet<>(), mGeneratedItems = new HashSet<>(); private final ArrayList<IOreRecipeRegistrator> mOreProcessing = new ArrayList<>(); public ItemStack mContainerItem = null; public ICondition<ISubTagContainer> mCondition = null; @@ -1009,71 +1008,71 @@ public enum OrePrefixes { public float mHeatDamage = 0.0F; // Negative for Frost Damage private final GT_HashSet<GT_ItemStack2> mContainsTestCache = new GT_HashSet<>(512, 0.5f); public static List<OrePrefixes> mPreventableComponents = new LinkedList<>( - Arrays.asList( - OrePrefixes.gem, - OrePrefixes.ingotHot, - OrePrefixes.ingotDouble, - OrePrefixes.ingotTriple, - OrePrefixes.ingotQuadruple, - OrePrefixes.ingotQuintuple, - OrePrefixes.plate, - OrePrefixes.plateDouble, - OrePrefixes.plateTriple, - OrePrefixes.plateQuadruple, - OrePrefixes.plateQuintuple, - OrePrefixes.plateDense, - OrePrefixes.stick, - OrePrefixes.round, - OrePrefixes.bolt, - OrePrefixes.screw, - OrePrefixes.ring, - OrePrefixes.foil, - OrePrefixes.toolHeadSword, - OrePrefixes.toolHeadPickaxe, - OrePrefixes.toolHeadShovel, - OrePrefixes.toolHeadAxe, - OrePrefixes.toolHeadHoe, - OrePrefixes.toolHeadHammer, - OrePrefixes.toolHeadFile, - OrePrefixes.toolHeadSaw, - OrePrefixes.toolHeadDrill, - OrePrefixes.toolHeadChainsaw, - OrePrefixes.toolHeadWrench, - OrePrefixes.toolHeadUniversalSpade, - OrePrefixes.toolHeadSense, - OrePrefixes.toolHeadPlow, - OrePrefixes.toolHeadArrow, - OrePrefixes.toolHeadBuzzSaw, - OrePrefixes.turbineBlade, - OrePrefixes.wireFine, - OrePrefixes.gearGtSmall, - OrePrefixes.rotor, - OrePrefixes.stickLong, - OrePrefixes.springSmall, - OrePrefixes.spring, - OrePrefixes.arrowGtWood, - OrePrefixes.arrowGtPlastic, - OrePrefixes.gemChipped, - OrePrefixes.gemFlawed, - OrePrefixes.gemFlawless, - OrePrefixes.gemExquisite, - OrePrefixes.gearGt, - OrePrefixes.crateGtDust, - OrePrefixes.crateGtIngot, - OrePrefixes.crateGtGem, - OrePrefixes.crateGtPlate, - OrePrefixes.itemCasing, - OrePrefixes.nanite)); + Arrays.asList( + OrePrefixes.gem, + OrePrefixes.ingotHot, + OrePrefixes.ingotDouble, + OrePrefixes.ingotTriple, + OrePrefixes.ingotQuadruple, + OrePrefixes.ingotQuintuple, + OrePrefixes.plate, + OrePrefixes.plateDouble, + OrePrefixes.plateTriple, + OrePrefixes.plateQuadruple, + OrePrefixes.plateQuintuple, + OrePrefixes.plateDense, + OrePrefixes.stick, + OrePrefixes.round, + OrePrefixes.bolt, + OrePrefixes.screw, + OrePrefixes.ring, + OrePrefixes.foil, + OrePrefixes.toolHeadSword, + OrePrefixes.toolHeadPickaxe, + OrePrefixes.toolHeadShovel, + OrePrefixes.toolHeadAxe, + OrePrefixes.toolHeadHoe, + OrePrefixes.toolHeadHammer, + OrePrefixes.toolHeadFile, + OrePrefixes.toolHeadSaw, + OrePrefixes.toolHeadDrill, + OrePrefixes.toolHeadChainsaw, + OrePrefixes.toolHeadWrench, + OrePrefixes.toolHeadUniversalSpade, + OrePrefixes.toolHeadSense, + OrePrefixes.toolHeadPlow, + OrePrefixes.toolHeadArrow, + OrePrefixes.toolHeadBuzzSaw, + OrePrefixes.turbineBlade, + OrePrefixes.wireFine, + OrePrefixes.gearGtSmall, + OrePrefixes.rotor, + OrePrefixes.stickLong, + OrePrefixes.springSmall, + OrePrefixes.spring, + OrePrefixes.arrowGtWood, + OrePrefixes.arrowGtPlastic, + OrePrefixes.gemChipped, + OrePrefixes.gemFlawed, + OrePrefixes.gemFlawless, + OrePrefixes.gemExquisite, + OrePrefixes.gearGt, + OrePrefixes.crateGtDust, + OrePrefixes.crateGtIngot, + OrePrefixes.crateGtGem, + OrePrefixes.crateGtPlate, + OrePrefixes.itemCasing, + OrePrefixes.nanite)); /** * Yes this Value can be changed to add Bits for the MetaGenerated-Item-Check. */ public int mMaterialGenerationBits = 0; OrePrefixes(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) { + 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) { mIsUnificatable = aIsUnificatable; mIsMaterialBased = aIsMaterialBased; mIsSelfReferencing = aIsSelfReferencing; @@ -1130,109 +1129,59 @@ public enum OrePrefixes { public static void initMaterialComponents() { boolean enablePerItemSettings = GregTech_API.sMaterialComponents.get("general", "enablePerItemSettings", false); - boolean enableUnusedIngotHot = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedIngotHot", - false); - boolean enableUnusedPlates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedPlates", - false); - boolean enableUnusedDoubleIngots = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedDoubleIngots", - false); - boolean enableUnusedTripleIngots = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedTripleIngots", - false); - boolean enableUnusedQuadIngots = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedQuadIngots", - false); - boolean enableUnusedQuinIngots = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedQuinIngots", - false); - boolean enableUnusedDoublePlates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedDoublePlates", - false); - boolean enableUnusedTriplePlates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedTriplePlates", - false); - boolean enableUnusedQuadPlates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedQuadPlates", - false); - boolean enableUnusedQuinPlates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedQuinPlates", - false); - boolean enableUnusedDensePlates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedDensePlates", - false); - boolean enableUnusedGears = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedGears", - false); - boolean enableUnusedSmallGears = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedSmallGears", - false); - boolean enableUnusedRings = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedRings", - false); - boolean enableUnusedSprings = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedSprings", - false); - boolean enableUnusedSmallSprings = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedSmallSprings", - false); - boolean enableUnusedRounds = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedRounds", - false); - boolean enableUnusedRotors = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedRotors", - false); - boolean enableUnusedFineWires = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedFineWires", - false); + boolean enableUnusedIngotHot = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedIngotHot", false); + boolean enableUnusedPlates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedPlates", false); + boolean enableUnusedDoubleIngots = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedDoubleIngots", false); + boolean enableUnusedTripleIngots = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedTripleIngots", false); + boolean enableUnusedQuadIngots = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedQuadIngots", false); + boolean enableUnusedQuinIngots = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedQuinIngots", false); + boolean enableUnusedDoublePlates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedDoublePlates", false); + boolean enableUnusedTriplePlates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedTriplePlates", false); + boolean enableUnusedQuadPlates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedQuadPlates", false); + boolean enableUnusedQuinPlates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedQuinPlates", false); + boolean enableUnusedDensePlates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedDensePlates", false); + boolean enableUnusedGears = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedGears", false); + boolean enableUnusedSmallGears = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedSmallGears", false); + boolean enableUnusedRings = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedRings", false); + boolean enableUnusedSprings = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedSprings", false); + boolean enableUnusedSmallSprings = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedSmallSprings", false); + boolean enableUnusedRounds = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedRounds", false); + boolean enableUnusedRotors = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedRotors", false); + boolean enableUnusedFineWires = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedFineWires", false); boolean enableUnusedFoil = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedFoil", false); - boolean enableUnusedArrows = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedArrowHeads", - false); - boolean enableUnusedCrates = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedCrates", - false); - boolean enableUnusedBolts = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedBolts", - false); - boolean enableUnusedScrews = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedScrews", - false); + boolean enableUnusedArrows = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedArrowHeads", false); + boolean enableUnusedCrates = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedCrates", false); + boolean enableUnusedBolts = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedBolts", false); + boolean enableUnusedScrews = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedScrews", false); boolean enableUnusedRods = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedRods", false); - boolean enableUnusedLongRods = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedLongRods", - false); + boolean enableUnusedLongRods = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedLongRods", false); boolean enableUnusedGems = GregTech_API.sMaterialComponents.get("globalcomponents", "enableUnusedGems", false); - boolean enableUnusedItemCasing = GregTech_API.sMaterialComponents.get( - "globalcomponents", - "enableUnusedItemCasing", - false); + boolean enableUnusedItemCasing = GregTech_API.sMaterialComponents + .get("globalcomponents", "enableUnusedItemCasing", false); // TODO possibly use OrePrefix mNotGeneratedItems/mGeneratedItems instead of a static List for every material // instance? @@ -1248,13 +1197,11 @@ public enum OrePrefixes { if (!enableUnusedSprings && (aMaterial != Materials.Titanium)) spring.mDisabledItems.add(aMaterial); if (!enableUnusedSmallSprings) springSmall.mDisabledItems.add(aMaterial); if (!enableUnusedRounds && !(aMaterial == Materials.HSSE || aMaterial == Materials.Neutronium - || aMaterial == Materials.HSSG)) - round.mDisabledItems.add(aMaterial); + || aMaterial == Materials.HSSG)) round.mDisabledItems.add(aMaterial); if (!enableUnusedCrates) { if (!(aMaterial == Materials.DamascusSteel || aMaterial == Materials.Steel - || aMaterial == Materials.Bronze - || aMaterial == Materials.Manganese)) - crateGtIngot.mDisabledItems.add(aMaterial); + || aMaterial == Materials.Bronze + || aMaterial == Materials.Manganese)) crateGtIngot.mDisabledItems.add(aMaterial); if (!(aMaterial == Materials.Neodymium || aMaterial == Materials.Chrome)) crateGtDust.mDisabledItems.add(aMaterial); crateGtGem.mDisabledItems.add(aMaterial); @@ -1268,36 +1215,36 @@ public enum OrePrefixes { } // Plates if (!enableUnusedPlates && ((aMaterial.mTypes & 0x40) == 0) - && !(aMaterial == Materials.Silicon || aMaterial == Materials.Zinc - || aMaterial == Materials.Europium - || aMaterial == Materials.Americium - || aMaterial == Materials.RedAlloy - || aMaterial == Materials.SolderingAlloy - || aMaterial == Materials.BatteryAlloy - || aMaterial == Materials.AnnealedCopper - || aMaterial == Materials.Firestone - || aMaterial == Materials.VanadiumGallium - || aMaterial == Materials.YttriumBariumCuprate - || aMaterial == Materials.NiobiumTitanium - || aMaterial == Materials.CertusQuartz - || aMaterial == Materials.NetherQuartz - || aMaterial == Materials.Lazurite - || aMaterial == Materials.Lapis - || aMaterial == Materials.Paper - || aMaterial == Materials.Jasper - || aMaterial == Materials.Dilithium - || aMaterial == Materials.Forcicium - || aMaterial == Materials.Forcillium - || aMaterial == Materials.EnderPearl - || aMaterial == Materials.EnderEye - || aMaterial == Materials.Glass - || aMaterial == Materials.Copper - || aMaterial == Materials.Tin - || aMaterial == Materials.Redstone - || aMaterial == Materials.Sodalite - || aMaterial == Materials.Gallium - || aMaterial == Materials.GalliumArsenide - || aMaterial == Materials.IndiumGalliumPhosphide)) + && !(aMaterial == Materials.Silicon || aMaterial == Materials.Zinc + || aMaterial == Materials.Europium + || aMaterial == Materials.Americium + || aMaterial == Materials.RedAlloy + || aMaterial == Materials.SolderingAlloy + || aMaterial == Materials.BatteryAlloy + || aMaterial == Materials.AnnealedCopper + || aMaterial == Materials.Firestone + || aMaterial == Materials.VanadiumGallium + || aMaterial == Materials.YttriumBariumCuprate + || aMaterial == Materials.NiobiumTitanium + || aMaterial == Materials.CertusQuartz + || aMaterial == Materials.NetherQuartz + || aMaterial == Materials.Lazurite + || aMaterial == Materials.Lapis + || aMaterial == Materials.Paper + || aMaterial == Materials.Jasper + || aMaterial == Materials.Dilithium + || aMaterial == Materials.Forcicium + || aMaterial == Materials.Forcillium + || aMaterial == Materials.EnderPearl + || aMaterial == Materials.EnderEye + || aMaterial == Materials.Glass + || aMaterial == Materials.Copper + || aMaterial == Materials.Tin + || aMaterial == Materials.Redstone + || aMaterial == Materials.Sodalite + || aMaterial == Materials.Gallium + || aMaterial == Materials.GalliumArsenide + || aMaterial == Materials.IndiumGalliumPhosphide)) plate.mDisabledItems.add(aMaterial); if (!enableUnusedIngotHot) { ingotHot.mDisabledItems.add(aMaterial); @@ -1308,9 +1255,9 @@ public enum OrePrefixes { if (!enableUnusedQuadIngots) ingotQuadruple.mDisabledItems.add(aMaterial); if (!enableUnusedQuinIngots) ingotQuintuple.mDisabledItems.add(aMaterial); if (!enableUnusedDoublePlates && ((aMaterial.mTypes & 0x40) == 0) - && !(aMaterial == Materials.Paper || aMaterial == Materials.Aluminium - || aMaterial == Materials.Steel - || aMaterial == Materials.TungstenSteel)) + && !(aMaterial == Materials.Paper || aMaterial == Materials.Aluminium + || aMaterial == Materials.Steel + || aMaterial == Materials.TungstenSteel)) plateDouble.mDisabledItems.add(aMaterial); if (!enableUnusedTriplePlates && !(aMaterial == Materials.Paper)) plateTriple.mDisabledItems.add(aMaterial); @@ -1319,217 +1266,212 @@ public enum OrePrefixes { if (!enableUnusedQuinPlates && !(aMaterial == Materials.Paper)) plateQuintuple.mDisabledItems.add(aMaterial); if (!(enableUnusedDensePlates || GregTech_API.mGTPlusPlus) - && !(aMaterial == Materials.Iron || aMaterial == Materials.Copper - || aMaterial == Materials.Lead - || aMaterial == Materials.Paper - || aMaterial == Materials.Thaumium - || aMaterial == Materials.Titanium)) + && !(aMaterial == Materials.Iron || aMaterial == Materials.Copper + || aMaterial == Materials.Lead + || aMaterial == Materials.Paper + || aMaterial == Materials.Thaumium + || aMaterial == Materials.Titanium)) plateDense.mDisabledItems.add(aMaterial); // Rotors if (!enableUnusedRotors && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome + || aMaterial == Materials.Tin + || aMaterial == Materials.Osmium + || aMaterial == Materials.Iridium + || aMaterial == Materials.Bronze + || aMaterial == Materials.Steel + || aMaterial == Materials.StainlessSteel + || aMaterial == Materials.TungstenSteel + || aMaterial == Materials.HSSG + || aMaterial == Materials.HSSE + || aMaterial == Materials.Neutronium)) rotor.mDisabledItems.add(aMaterial); + // Rings + if (!enableUnusedRings && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome + || aMaterial == Materials.Iron + || aMaterial == Materials.Tin + || aMaterial == Materials.Osmium + || aMaterial == Materials.Iridium + || aMaterial == Materials.Bronze + || aMaterial == Materials.WroughtIron + || aMaterial == Materials.Steel + || aMaterial == Materials.StainlessSteel + || aMaterial == Materials.PigIron + || aMaterial == Materials.TungstenSteel + || aMaterial == Materials.Rubber + || aMaterial == Materials.HSSE + || aMaterial == Materials.Neutronium + || aMaterial == Materials.HSSG + || aMaterial == Materials.Aluminium + || aMaterial == Materials.Invar + || aMaterial == Materials.Brass + || aMaterial == Materials.Paper + || aMaterial == Materials.Silicone + || aMaterial == Materials.StyreneButadieneRubber)) ring.mDisabledItems.add(aMaterial); + // Foil + if (!enableUnusedFoil && !(aMaterial == Materials.Zinc || aMaterial == Materials.Aluminium + || aMaterial == Materials.Silicon + || aMaterial == Materials.Gold + || aMaterial == Materials.Electrum + || aMaterial == Materials.Platinum + || aMaterial == Materials.Osmiridium + || aMaterial == Materials.Osmium + || aMaterial == Materials.AnnealedCopper + || aMaterial == Materials.Steel + || aMaterial == Materials.Copper + || aMaterial == Materials.YttriumBariumCuprate + || aMaterial == Materials.VanadiumGallium + || aMaterial == Materials.NiobiumTitanium + || aMaterial == Materials.Naquadah + || aMaterial == Materials.Manganese + || aMaterial == Materials.Plastic + || aMaterial == Materials.Silicone + || aMaterial == Materials.PolyvinylChloride + || aMaterial == Materials.PolyphenyleneSulfide + || aMaterial == Materials.Nichrome + || aMaterial == Materials.BlackSteel + || aMaterial == Materials.Titanium + || aMaterial == Materials.TungstenSteel + || aMaterial == Materials.Tungsten + || aMaterial == Materials.HSSG + || aMaterial == Materials.NaquadahAlloy + || aMaterial == Materials.Duranium + || aMaterial == Materials.Europium + || aMaterial == Materials.Bedrockium)) foil.mDisabledItems.add(aMaterial); + // Fine Wire + if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper + || aMaterial == Materials.Platinum + || aMaterial == Materials.Osmium + || aMaterial == Materials.Tin + || aMaterial == Materials.Lead + || aMaterial == Materials.SolderingAlloy + || aMaterial == Materials.Copper + || aMaterial == Materials.Electrum + || aMaterial == Materials.Gold + || aMaterial == Materials.RedAlloy + || aMaterial == Materials.Graphene + || aMaterial == Materials.NiobiumTitanium + || aMaterial == Materials.YttriumBariumCuprate + || aMaterial == Materials.BloodInfusedIron + || aMaterial == Materials.Universium + || aMaterial == Materials.MagnetohydrodynamicallyConstrainedStarMatter)) + wireFine.mDisabledItems.add(aMaterial); + // Gears + if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium + || aMaterial == Materials.Iron + || aMaterial == Materials.Copper + || aMaterial == Materials.Tin + || aMaterial == Materials.Gold + || aMaterial == Materials.Stone + || aMaterial == Materials.Bronze + || aMaterial == Materials.Steel + || aMaterial == Materials.StainlessSteel + || aMaterial == Materials.TungstenSteel + || aMaterial == Materials.CobaltBrass + || aMaterial == Materials.Diamond + || aMaterial == Materials.Wood + || aMaterial == Materials.HSSG + || aMaterial == Materials.HSSE + || aMaterial == Materials.Neutronium)) gearGt.mDisabledItems.add(aMaterial); + // Small Gears + if (!enableUnusedSmallGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium + || aMaterial == Materials.Steel + || aMaterial == Materials.StainlessSteel + || aMaterial == Materials.TungstenSteel + || aMaterial == Materials.HSSG + || aMaterial == Materials.HSSE + || aMaterial == Materials.Neutronium + || aMaterial == Materials.VanadiumGallium + || aMaterial == Materials.Naquadah)) gearGtSmall.mDisabledItems.add(aMaterial); + // Bolts + if (!enableUnusedBolts && ((aMaterial.mTypes & 0x40) == 0) + && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome + || aMaterial == Materials.Iron || aMaterial == Materials.Tin || aMaterial == Materials.Osmium || aMaterial == Materials.Iridium + || aMaterial == Materials.Neutronium || aMaterial == Materials.Bronze + || aMaterial == Materials.WroughtIron || aMaterial == Materials.Steel || aMaterial == Materials.StainlessSteel + || aMaterial == Materials.PigIron || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.HSSG + || aMaterial == Materials.Tungsten || aMaterial == Materials.HSSE - || aMaterial == Materials.Neutronium)) - rotor.mDisabledItems.add(aMaterial); - // Rings - if (!enableUnusedRings && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome + || aMaterial == Materials.HSSG)) + bolt.mDisabledItems.add(aMaterial); + // Screws + if (!enableUnusedScrews && ((aMaterial.mTypes & 0x40) == 0) + && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome || aMaterial == Materials.Iron || aMaterial == Materials.Tin || aMaterial == Materials.Osmium || aMaterial == Materials.Iridium + || aMaterial == Materials.Neutronium || aMaterial == Materials.Bronze || aMaterial == Materials.WroughtIron || aMaterial == Materials.Steel || aMaterial == Materials.StainlessSteel || aMaterial == Materials.PigIron || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.Rubber || aMaterial == Materials.HSSE - || aMaterial == Materials.Neutronium - || aMaterial == Materials.HSSG - || aMaterial == Materials.Aluminium - || aMaterial == Materials.Invar - || aMaterial == Materials.Brass - || aMaterial == Materials.Paper - || aMaterial == Materials.Silicone - || aMaterial == Materials.StyreneButadieneRubber)) - ring.mDisabledItems.add(aMaterial); - // Foil - if (!enableUnusedFoil && !(aMaterial == Materials.Zinc || aMaterial == Materials.Aluminium - || aMaterial == Materials.Silicon - || aMaterial == Materials.Gold - || aMaterial == Materials.Electrum - || aMaterial == Materials.Platinum - || aMaterial == Materials.Osmiridium + || aMaterial == Materials.HSSG)) + screw.mDisabledItems.add(aMaterial); + // Rods + if (!enableUnusedRods && ((aMaterial.mTypes & 0x40) == 0) + && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome + || aMaterial == Materials.Iron + || aMaterial == Materials.Tin || aMaterial == Materials.Osmium - || aMaterial == Materials.AnnealedCopper + || aMaterial == Materials.Iridium + || aMaterial == Materials.Neutronium + || aMaterial == Materials.Bronze + || aMaterial == Materials.WroughtIron || aMaterial == Materials.Steel - || aMaterial == Materials.Copper - || aMaterial == Materials.YttriumBariumCuprate - || aMaterial == Materials.VanadiumGallium - || aMaterial == Materials.NiobiumTitanium - || aMaterial == Materials.Naquadah - || aMaterial == Materials.Manganese - || aMaterial == Materials.Plastic - || aMaterial == Materials.Silicone - || aMaterial == Materials.PolyvinylChloride - || aMaterial == Materials.PolyphenyleneSulfide - || aMaterial == Materials.Nichrome - || aMaterial == Materials.BlackSteel - || aMaterial == Materials.Titanium + || aMaterial == Materials.StainlessSteel + || aMaterial == Materials.PigIron || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.Tungsten + || aMaterial == Materials.HSSE || aMaterial == Materials.HSSG - || aMaterial == Materials.NaquadahAlloy - || aMaterial == Materials.Duranium + || aMaterial == Materials.Aluminium + || aMaterial == Materials.Copper + || aMaterial == Materials.Neodymium || aMaterial == Materials.Europium - || aMaterial == Materials.Bedrockium)) - foil.mDisabledItems.add(aMaterial); - // Fine Wire - if (!enableUnusedFineWires && !(aMaterial == Materials.Steel || aMaterial == Materials.AnnealedCopper || aMaterial == Materials.Platinum - || aMaterial == Materials.Osmium - || aMaterial == Materials.Tin - || aMaterial == Materials.Lead - || aMaterial == Materials.SolderingAlloy - || aMaterial == Materials.Copper - || aMaterial == Materials.Electrum || aMaterial == Materials.Gold - || aMaterial == Materials.RedAlloy - || aMaterial == Materials.Graphene - || aMaterial == Materials.NiobiumTitanium - || aMaterial == Materials.YttriumBariumCuprate - || aMaterial == Materials.BloodInfusedIron - || aMaterial == Materials.Universium - || aMaterial == Materials.MagnetohydrodynamicallyConstrainedStarMatter)) - wireFine.mDisabledItems.add(aMaterial); - // Gears - if (!enableUnusedGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium - || aMaterial == Materials.Iron - || aMaterial == Materials.Copper - || aMaterial == Materials.Tin - || aMaterial == Materials.Gold - || aMaterial == Materials.Stone - || aMaterial == Materials.Bronze - || aMaterial == Materials.Steel - || aMaterial == Materials.StainlessSteel - || aMaterial == Materials.TungstenSteel + || aMaterial == Materials.Uranium235 + || aMaterial == Materials.Plutonium241 + || aMaterial == Materials.Americium + || aMaterial == Materials.Brass + || aMaterial == Materials.Electrum + || aMaterial == Materials.NaquadahEnriched || aMaterial == Materials.CobaltBrass + || aMaterial == Materials.IronMagnetic + || aMaterial == Materials.SteelMagnetic + || aMaterial == Materials.NeodymiumMagnetic + || aMaterial == Materials.Samarium + || aMaterial == Materials.SamariumMagnetic + || aMaterial == Materials.VanadiumGallium || aMaterial == Materials.Diamond || aMaterial == Materials.Wood - || aMaterial == Materials.HSSG - || aMaterial == Materials.HSSE - || aMaterial == Materials.Neutronium)) - gearGt.mDisabledItems.add(aMaterial); - // Small Gears - if (!enableUnusedSmallGears && !(aMaterial == Materials.Aluminium || aMaterial == Materials.Titanium - || aMaterial == Materials.Steel - || aMaterial == Materials.StainlessSteel - || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.HSSG - || aMaterial == Materials.HSSE - || aMaterial == Materials.Neutronium - || aMaterial == Materials.VanadiumGallium - || aMaterial == Materials.Naquadah)) - gearGtSmall.mDisabledItems.add(aMaterial); - // Bolts - if (!enableUnusedBolts && ((aMaterial.mTypes & 0x40) == 0) - && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome - || aMaterial == Materials.Iron - || aMaterial == Materials.Tin - || aMaterial == Materials.Osmium - || aMaterial == Materials.Iridium - || aMaterial == Materials.Neutronium - || aMaterial == Materials.Bronze - || aMaterial == Materials.WroughtIron - || aMaterial == Materials.Steel - || aMaterial == Materials.StainlessSteel - || aMaterial == Materials.PigIron - || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.Tungsten - || aMaterial == Materials.HSSE - || aMaterial == Materials.HSSG)) - bolt.mDisabledItems.add(aMaterial); - // Screws - if (!enableUnusedScrews && ((aMaterial.mTypes & 0x40) == 0) - && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome - || aMaterial == Materials.Iron - || aMaterial == Materials.Tin - || aMaterial == Materials.Osmium - || aMaterial == Materials.Iridium - || aMaterial == Materials.Neutronium - || aMaterial == Materials.Bronze - || aMaterial == Materials.WroughtIron - || aMaterial == Materials.Steel - || aMaterial == Materials.StainlessSteel - || aMaterial == Materials.PigIron - || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.HSSE - || aMaterial == Materials.HSSG)) - screw.mDisabledItems.add(aMaterial); - // Rods - if (!enableUnusedRods && ((aMaterial.mTypes & 0x40) == 0) - && !(aMaterial == Materials.Titanium || aMaterial == Materials.Chrome - || aMaterial == Materials.Iron - || aMaterial == Materials.Tin - || aMaterial == Materials.Osmium - || aMaterial == Materials.Iridium - || aMaterial == Materials.Neutronium - || aMaterial == Materials.Bronze - || aMaterial == Materials.WroughtIron - || aMaterial == Materials.Steel - || aMaterial == Materials.StainlessSteel - || aMaterial == Materials.PigIron - || aMaterial == Materials.TungstenSteel - || aMaterial == Materials.HSSE - || aMaterial == Materials.HSSG - || aMaterial == Materials.Aluminium - || aMaterial == Materials.Copper - || aMaterial == Materials.Neodymium - || aMaterial == Materials.Europium - || aMaterial == Materials.Platinum - || aMaterial == Materials.Gold - || aMaterial == Materials.Uranium235 - || aMaterial == Materials.Plutonium241 - || aMaterial == Materials.Americium - || aMaterial == Materials.Brass - || aMaterial == Materials.Electrum - || aMaterial == Materials.NaquadahEnriched - || aMaterial == Materials.CobaltBrass - || aMaterial == Materials.IronMagnetic - || aMaterial == Materials.SteelMagnetic - || aMaterial == Materials.NeodymiumMagnetic - || aMaterial == Materials.Samarium - || aMaterial == Materials.SamariumMagnetic - || aMaterial == Materials.VanadiumGallium - || aMaterial == Materials.Diamond - || aMaterial == Materials.Wood - || aMaterial == Materials.Plastic - || aMaterial == Materials.Lead - || aMaterial == Materials.SolderingAlloy - || aMaterial == Materials.Lapis - || aMaterial == Materials.Lazurite - || aMaterial == Materials.Sodalite - || aMaterial == Materials.PolyvinylChloride)) + || aMaterial == Materials.Plastic + || aMaterial == Materials.Lead + || aMaterial == Materials.SolderingAlloy + || aMaterial == Materials.Lapis + || aMaterial == Materials.Lazurite + || aMaterial == Materials.Sodalite + || aMaterial == Materials.PolyvinylChloride)) stick.mDisabledItems.add(aMaterial); // Long Rods if (!enableUnusedLongRods && ((aMaterial.mTypes & 0x40) == 0) - && !(aMaterial == Materials.Titanium || aMaterial == Materials.NeodymiumMagnetic - || aMaterial == Materials.SamariumMagnetic - || aMaterial == Materials.HSSG - || aMaterial == Materials.HSSE - || aMaterial == Materials.Neutronium - || aMaterial == Materials.Americium - || aMaterial == Materials.WroughtIron - || aMaterial == Materials.Magnalium - || aMaterial == Materials.TungstenSteel)) + && !(aMaterial == Materials.Titanium || aMaterial == Materials.NeodymiumMagnetic + || aMaterial == Materials.SamariumMagnetic + || aMaterial == Materials.HSSG + || aMaterial == Materials.HSSE + || aMaterial == Materials.Neutronium + || aMaterial == Materials.Americium + || aMaterial == Materials.WroughtIron + || aMaterial == Materials.Magnalium + || aMaterial == Materials.TungstenSteel)) stickLong.mDisabledItems.add(aMaterial); if (!enableUnusedGems && ((aMaterial.mTypes & 0x04) == 0)) { @@ -1554,15 +1496,13 @@ public enum OrePrefixes { if (enablePerItemSettings) { StringBuilder aConfigPathSB = new StringBuilder(); aConfigPathSB.append("materialcomponents.") - .append(aMaterial.mConfigSection) - .append(".") - .append(aMaterial.mName); + .append(aMaterial.mConfigSection) + .append(".") + .append(aMaterial.mName); String aConfigPath = aConfigPathSB.toString(); for (OrePrefixes aPrefix : mPreventableComponents) { - boolean aEnableComponent = GregTech_API.sMaterialComponents.get( - aConfigPath, - aPrefix.toString(), - !aPrefix.mDisabledItems.contains(aMaterial)); + boolean aEnableComponent = GregTech_API.sMaterialComponents + .get(aConfigPath, aPrefix.toString(), !aPrefix.mDisabledItems.contains(aMaterial)); if (!aEnableComponent) { // Disable component if false and is not already in disabled list aPrefix.disableComponent(aMaterial); } else { // Enable component if true and is not already in enabled list @@ -1665,10 +1605,10 @@ public enum OrePrefixes { public boolean doGenerateItem(Materials aMaterial) { return aMaterial != null && aMaterial != Materials._NULL - && ((aMaterial.mTypes & mMaterialGenerationBits) != 0 || mGeneratedItems.contains(aMaterial)) - && !mNotGeneratedItems.contains(aMaterial) - && !mDisabledItems.contains(aMaterial) - && (mCondition == null || mCondition.isTrue(aMaterial)); + && ((aMaterial.mTypes & mMaterialGenerationBits) != 0 || mGeneratedItems.contains(aMaterial)) + && !mNotGeneratedItems.contains(aMaterial) + && !mDisabledItems.contains(aMaterial) + && (mCondition == null || mCondition.isTrue(aMaterial)); } public boolean ignoreMaterials(Materials... aMaterials) { @@ -1702,17 +1642,17 @@ public enum OrePrefixes { } if ((aMaterial != Materials._NULL || mIsSelfReferencing || !mIsMaterialBased) - && GT_Utility.isStackValid(aStack)) { + && GT_Utility.isStackValid(aStack)) { // if (Materials.mPreventableComponents.contains(this) && !this.mDynamicItems.contains(aMaterial)) return; for (IOreRecipeRegistrator tRegistrator : mOreProcessing) { if (D2) GT_Log.ore.println( - "Processing '" + aOreDictName - + "' with the Prefix '" - + name() - + "' and the Material '" - + aMaterial.mName - + "' at " - + GT_Utility.getClassName(tRegistrator)); + "Processing '" + aOreDictName + + "' with the Prefix '" + + name() + + "' and the Material '" + + aMaterial.mName + + "' at " + + GT_Utility.getClassName(tRegistrator)); tRegistrator.registerOre(this, aMaterial, aOreDictName, aModName, GT_Utility.copyAmount(1, aStack)); } } diff --git a/src/main/java/gregtech/api/enums/SoundResource.java b/src/main/java/gregtech/api/enums/SoundResource.java index 5d24abaea0..23887aebbf 100644 --- a/src/main/java/gregtech/api/enums/SoundResource.java +++ b/src/main/java/gregtech/api/enums/SoundResource.java @@ -305,9 +305,9 @@ public enum SoundResource { static { EnumSet.allOf(SoundResource.class) - .forEach(sound -> { if (sound.id >= 0) ID_SOUND_MAP.put(sound.id, sound); }); + .forEach(sound -> { if (sound.id >= 0) ID_SOUND_MAP.put(sound.id, sound); }); EnumSet.allOf(SoundResource.class) - .forEach(sound -> RESOURCE_STR_SOUND_MAP.put(sound.resourceLocation.toString(), sound)); + .forEach(sound -> RESOURCE_STR_SOUND_MAP.put(sound.resourceLocation.toString(), sound)); } /** diff --git a/src/main/java/gregtech/api/enums/SubTag.java b/src/main/java/gregtech/api/enums/SubTag.java index 1298e74f34..337a171d57 100644 --- a/src/main/java/gregtech/api/enums/SubTag.java +++ b/src/main/java/gregtech/api/enums/SubTag.java @@ -32,7 +32,7 @@ public final class SubTag implements ICondition<ISubTagContainer> { * listed are: Iron, Pyrite, PigIron, DeepIron, ShadowIron, WroughtIron and MeteoricIron. */ public static final SubTag BLASTFURNACE_CALCITE_DOUBLE = getNewSubTag("BLASTFURNACE_CALCITE_DOUBLE"), - BLASTFURNACE_CALCITE_TRIPLE = getNewSubTag("BLASTFURNACE_CALCITE_TRIPLE"); + BLASTFURNACE_CALCITE_TRIPLE = getNewSubTag("BLASTFURNACE_CALCITE_TRIPLE"); /** * Add this to a material with Direct Smelting to prevent the automatic generation of a Bricked/Bronze Blast Furnace @@ -72,7 +72,7 @@ public final class SubTag implements ICondition<ISubTagContainer> { * Add this to your Material if you want to have its Ore electromagnetically separated to give Neodymium. */ public static final SubTag ELECTROMAGNETIC_SEPERATION_NEODYMIUM = getNewSubTag( - "ELECTROMAGNETIC_SEPERATION_NEODYMIUM"); + "ELECTROMAGNETIC_SEPERATION_NEODYMIUM"); /** * Add this to your Material if you want to have its Ore giving Cinnabar Crystals on Pulverization. Already listed * are: Redstone diff --git a/src/main/java/gregtech/api/enums/TextureSet.java b/src/main/java/gregtech/api/enums/TextureSet.java index 78829ca01f..3fb15656e5 100644 --- a/src/main/java/gregtech/api/enums/TextureSet.java +++ b/src/main/java/gregtech/api/enums/TextureSet.java @@ -8,70 +8,66 @@ public class TextureSet { private static final String aTextVoidDir = "/void"; private static final TextureType[] IS_BLOCK_TEXTURE = new TextureType[] { TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, - TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, - TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, - TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, - TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, - TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, - TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, - TextureType.ITEM, }; + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, + TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, + TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, + TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, + TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, + TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, + TextureType.BLOCK, TextureType.BLOCK, TextureType.BLOCK, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, + TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, TextureType.ITEM, }; private static final String[] SUFFIXES = new String[] { "/dustTiny", "/dustSmall", "/dust", "/dustImpure", - "/dustPure", "/crushed", "/crushedPurified", "/crushedCentrifuged", "/gem", "/nugget", "/casingSmall", - "/ingot", "/ingotHot", "/ingotDouble", "/ingotTriple", "/ingotQuadruple", "/ingotQuintuple", "/plate", - "/plateDouble", "/plateTriple", "/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", - "/round", "/bolt", "/screw", "/ring", "/foil", "/cell", "/cellPlasma", "/toolHeadSword", "/toolHeadPickaxe", - "/toolHeadShovel", "/toolHeadAxe", "/toolHeadHoe", "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", - "/toolHeadDrill", "/toolHeadChainsaw", "/toolHeadWrench", "/toolHeadUniversalSpade", "/toolHeadSense", - "/toolHeadPlow", "/toolHeadArrow", "/toolHeadScrewdriver", "/toolHeadBuzzSaw", "/toolHeadSoldering", - "/nanites", "/wireFine", "/gearGtSmall", "/rotor", "/stickLong", "/springSmall", "/spring", "/arrowGtWood", - "/arrowGtPlastic", "/gemChipped", "/gemFlawed", "/gemFlawless", "/gemExquisite", "/gearGt", aTextVoidDir, - aTextVoidDir, aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil", "/block1", "/block2", "/block3", - "/block4", "/block5", "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall", "/pipeMedium", "/pipeLarge", - "/pipeHuge", "/frameGt", "/pipeQuadruple", "/pipeNonuple", aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - "/crateGtDust", "/crateGtIngot", "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, - aTextVoidDir, aTextVoidDir, aTextVoidDir, "/handleMallet", "/toolHeadMallet", }; + "/dustPure", "/crushed", "/crushedPurified", "/crushedCentrifuged", "/gem", "/nugget", "/casingSmall", "/ingot", + "/ingotHot", "/ingotDouble", "/ingotTriple", "/ingotQuadruple", "/ingotQuintuple", "/plate", "/plateDouble", + "/plateTriple", "/plateQuadruple", "/plateQuintuple", "/plateDense", "/stick", "/lens", "/round", "/bolt", + "/screw", "/ring", "/foil", "/cell", "/cellPlasma", "/toolHeadSword", "/toolHeadPickaxe", "/toolHeadShovel", + "/toolHeadAxe", "/toolHeadHoe", "/toolHeadHammer", "/toolHeadFile", "/toolHeadSaw", "/toolHeadDrill", + "/toolHeadChainsaw", "/toolHeadWrench", "/toolHeadUniversalSpade", "/toolHeadSense", "/toolHeadPlow", + "/toolHeadArrow", "/toolHeadScrewdriver", "/toolHeadBuzzSaw", "/toolHeadSoldering", "/nanites", "/wireFine", + "/gearGtSmall", "/rotor", "/stickLong", "/springSmall", "/spring", "/arrowGtWood", "/arrowGtPlastic", + "/gemChipped", "/gemFlawed", "/gemFlawless", "/gemExquisite", "/gearGt", aTextVoidDir, aTextVoidDir, + aTextVoidDir, "/oreSmall", "/ore", "/wire", "/foil", "/block1", "/block2", "/block3", "/block4", "/block5", + "/block6", "/pipeSide", "/pipeTiny", "/pipeSmall", "/pipeMedium", "/pipeLarge", "/pipeHuge", "/frameGt", + "/pipeQuadruple", "/pipeNonuple", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/crateGtDust", "/crateGtIngot", + "/crateGtGem", "/crateGtPlate", "/turbineBlade", aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, + aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, aTextVoidDir, "/handleMallet", "/toolHeadMallet", }; public boolean is_custom = false; public static final TextureSet SET_NONE = new TextureSet("NONE"), SET_DULL = new TextureSet("DULL"), - SET_RUBY = new TextureSet("RUBY"), SET_OPAL = new TextureSet("OPAL"), SET_LEAF = new TextureSet("LEAF"), - SET_WOOD = new TextureSet("WOOD"), SET_SAND = new TextureSet("SAND"), SET_FINE = new TextureSet("FINE"), - SET_FIERY = new TextureSet("FIERY"), SET_FLUID = new TextureSet("FLUID"), - SET_ROUGH = new TextureSet("ROUGH"), SET_PAPER = new TextureSet("PAPER"), - SET_GLASS = new TextureSet("GLASS"), SET_FLINT = new TextureSet("FLINT"), - SET_LAPIS = new TextureSet("LAPIS"), SET_SHINY = new TextureSet("SHINY"), - SET_SHARDS = new TextureSet("SHARDS"), SET_POWDER = new TextureSet("POWDER"), - SET_QUARTZ = new TextureSet("QUARTZ"), SET_EMERALD = new TextureSet("EMERALD"), - SET_DIAMOND = new TextureSet("DIAMOND"), SET_LIGNITE = new TextureSet("LIGNITE"), - SET_MAGNETIC = new TextureSet("MAGNETIC"), SET_METALLIC = new TextureSet("METALLIC"), - SET_NETHERSTAR = new TextureSet("NETHERSTAR"), SET_GEM_VERTICAL = new TextureSet("GEM_VERTICAL"), - SET_GEM_HORIZONTAL = new TextureSet("GEM_HORIZONTAL"); + SET_RUBY = new TextureSet("RUBY"), SET_OPAL = new TextureSet("OPAL"), SET_LEAF = new TextureSet("LEAF"), + SET_WOOD = new TextureSet("WOOD"), SET_SAND = new TextureSet("SAND"), SET_FINE = new TextureSet("FINE"), + SET_FIERY = new TextureSet("FIERY"), SET_FLUID = new TextureSet("FLUID"), SET_ROUGH = new TextureSet("ROUGH"), + SET_PAPER = new TextureSet("PAPER"), SET_GLASS = new TextureSet("GLASS"), SET_FLINT = new TextureSet("FLINT"), + SET_LAPIS = new TextureSet("LAPIS"), SET_SHINY = new TextureSet("SHINY"), SET_SHARDS = new TextureSet("SHARDS"), + SET_POWDER = new TextureSet("POWDER"), SET_QUARTZ = new TextureSet("QUARTZ"), + SET_EMERALD = new TextureSet("EMERALD"), SET_DIAMOND = new TextureSet("DIAMOND"), + SET_LIGNITE = new TextureSet("LIGNITE"), SET_MAGNETIC = new TextureSet("MAGNETIC"), + SET_METALLIC = new TextureSet("METALLIC"), SET_NETHERSTAR = new TextureSet("NETHERSTAR"), + SET_GEM_VERTICAL = new TextureSet("GEM_VERTICAL"), SET_GEM_HORIZONTAL = new TextureSet("GEM_HORIZONTAL"); /** * For the Indices of OrePrefixes you need to look into the OrePrefix Enum. */ public static final short INDEX_wire = 69, INDEX_foil = 70, INDEX_block1 = 71, INDEX_block2 = 72, INDEX_block3 = 73, - INDEX_block4 = 74, INDEX_block5 = 75, INDEX_block6 = 76; + INDEX_block4 = 74, INDEX_block5 = 75, INDEX_block6 = 76; public final IIconContainer[] mTextures = new IIconContainer[128]; public final String mSetName; diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java index f554ee852c..fc2f0bb8e0 100644 --- a/src/main/java/gregtech/api/enums/Textures.java +++ b/src/main/java/gregtech/api/enums/Textures.java @@ -1354,302 +1354,295 @@ public class Textures { * Icons for Hardened CFoam 0 = No Color 1 - 16 = Colors */ public static final ITexture[][] HARDENEDFOAMS = { - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.CONSTRUCTION_FOAM.mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[0].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[1].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[2].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[3].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[4].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[5].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[6].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[7].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[8].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[9].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[10].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[11].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[12].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[13].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[14].mRGBa) }, - new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[15].mRGBa) } }; + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.CONSTRUCTION_FOAM.mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[0].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[1].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[2].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[3].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[4].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[5].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[6].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[7].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[8].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[9].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[10].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[11].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[12].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[13].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[14].mRGBa) }, + new ITexture[] { TextureFactory.of(CFOAM_HARDENED, Dyes.VALUES[15].mRGBa) } }; /** * Machine Casings by Tier 0 = 8V, 1 = LV, 2 = MV, 3 = HV, 4 = EV, 5 = IV, 6 = IV, 7 = IV, 8 = IV, 9 = IV */ public static final IIconContainer[] MACHINECASINGS_SIDE = { MACHINE_8V_SIDE, MACHINE_LV_SIDE, MACHINE_MV_SIDE, - MACHINE_HV_SIDE, MACHINE_EV_SIDE, MACHINE_IV_SIDE, MACHINE_LuV_SIDE, MACHINE_ZPM_SIDE, MACHINE_UV_SIDE, - MACHINE_MAX_SIDE, MACHINE_UEV_SIDE, MACHINE_UIV_SIDE, MACHINE_UMV_SIDE, MACHINE_UXV_SIDE, - MACHINE_MAXV_SIDE, }, - MACHINECASINGS_TOP = { MACHINE_8V_TOP, MACHINE_LV_TOP, MACHINE_MV_TOP, MACHINE_HV_TOP, MACHINE_EV_TOP, - MACHINE_IV_TOP, MACHINE_LuV_TOP, MACHINE_ZPM_TOP, MACHINE_UV_TOP, MACHINE_MAX_TOP, - MACHINE_UEV_TOP, MACHINE_UIV_TOP, MACHINE_UMV_TOP, MACHINE_UXV_TOP, MACHINE_MAXV_TOP, }, - MACHINECASINGS_BOTTOM = { MACHINE_8V_BOTTOM, MACHINE_LV_BOTTOM, MACHINE_MV_BOTTOM, MACHINE_HV_BOTTOM, - MACHINE_EV_BOTTOM, MACHINE_IV_BOTTOM, MACHINE_LuV_BOTTOM, MACHINE_ZPM_BOTTOM, MACHINE_UV_BOTTOM, - MACHINE_MAX_BOTTOM, MACHINE_UEV_BOTTOM, MACHINE_UIV_BOTTOM, MACHINE_UMV_BOTTOM, - MACHINE_UXV_BOTTOM, MACHINE_MAXV_BOTTOM, }, - GRANITES = { GRANITE_BLACK_STONE, GRANITE_BLACK_COBBLE, GRANITE_BLACK_COBBLE_MOSSY, - GRANITE_BLACK_BRICKS, GRANITE_BLACK_BRICKS_CRACKED, GRANITE_BLACK_BRICKS_MOSSY, - GRANITE_BLACK_BRICKS_CHISELED, GRANITE_BLACK_SMOOTH, GRANITE_RED_STONE, GRANITE_RED_COBBLE, - GRANITE_RED_COBBLE_MOSSY, GRANITE_RED_BRICKS, GRANITE_RED_BRICKS_CRACKED, - GRANITE_RED_BRICKS_MOSSY, GRANITE_RED_BRICKS_CHISELED, GRANITE_RED_SMOOTH, }, - CONCRETES = { CONCRETE_DARK_STONE, CONCRETE_DARK_COBBLE, CONCRETE_DARK_COBBLE_MOSSY, - CONCRETE_DARK_BRICKS, CONCRETE_DARK_BRICKS_CRACKED, CONCRETE_DARK_BRICKS_MOSSY, - CONCRETE_DARK_BRICKS_CHISELED, CONCRETE_DARK_SMOOTH, CONCRETE_LIGHT_STONE, - CONCRETE_LIGHT_COBBLE, CONCRETE_LIGHT_COBBLE_MOSSY, CONCRETE_LIGHT_BRICKS, - CONCRETE_LIGHT_BRICKS_CRACKED, CONCRETE_LIGHT_BRICKS_MOSSY, CONCRETE_LIGHT_BRICKS_CHISELED, - CONCRETE_LIGHT_SMOOTH, }, - STONES = { MARBLE_STONE, MARBLE_COBBLE, MARBLE_COBBLE_MOSSY, MARBLE_BRICKS, MARBLE_BRICKS_CRACKED, - MARBLE_BRICKS_MOSSY, MARBLE_BRICKS_CHISELED, MARBLE_SMOOTH, BASALT_STONE, BASALT_COBBLE, - BASALT_COBBLE_MOSSY, BASALT_BRICKS, BASALT_BRICKS_CRACKED, BASALT_BRICKS_MOSSY, - BASALT_BRICKS_CHISELED, BASALT_SMOOTH, }, - TURBINE = { LARGETURBINE_ST1, LARGETURBINE_ST2, LARGETURBINE_ST3, LARGETURBINE_ST4, LARGETURBINE_ST5, - LARGETURBINE_ST6, LARGETURBINE_ST7, LARGETURBINE_ST8, LARGETURBINE_ST9 }, - TURBINE_ACTIVE = { LARGETURBINE_ST_ACTIVE1, LARGETURBINE_ST_ACTIVE2, LARGETURBINE_ST_ACTIVE3, - LARGETURBINE_ST_ACTIVE4, LARGETURBINE_ST_ACTIVE5, LARGETURBINE_ST_ACTIVE6, - LARGETURBINE_ST_ACTIVE7, LARGETURBINE_ST_ACTIVE8, LARGETURBINE_ST_ACTIVE9 }, - TURBINE_EMPTY = { LARGETURBINE_ST_EMPTY1, LARGETURBINE_ST_EMPTY2, LARGETURBINE_ST_EMPTY3, - LARGETURBINE_ST_EMPTY4, LARGETURBINE_ST_EMPTY5, LARGETURBINE_ST_EMPTY6, LARGETURBINE_ST_EMPTY7, - LARGETURBINE_ST_EMPTY8, LARGETURBINE_ST_EMPTY9 }, - TURBINE_NEW = { LARGETURBINE_NEW1, LARGETURBINE_NEW2, LARGETURBINE_NEW3, LARGETURBINE_NEW4, - LARGETURBINE_NEW5, LARGETURBINE_NEW6, LARGETURBINE_NEW7, LARGETURBINE_NEW8, LARGETURBINE_NEW9 }, - TURBINE_NEW_ACTIVE = { LARGETURBINE_NEW_ACTIVE1, LARGETURBINE_NEW_ACTIVE2, LARGETURBINE_NEW_ACTIVE3, - LARGETURBINE_NEW_ACTIVE4, LARGETURBINE_NEW_ACTIVE5, LARGETURBINE_NEW_ACTIVE6, - LARGETURBINE_NEW_ACTIVE7, LARGETURBINE_NEW_ACTIVE8, LARGETURBINE_NEW_ACTIVE9 }, - TURBINE_NEW_EMPTY = { LARGETURBINE_NEW_EMPTY1, LARGETURBINE_NEW_EMPTY2, LARGETURBINE_NEW_EMPTY3, - LARGETURBINE_NEW_EMPTY4, LARGETURBINE_NEW_EMPTY5, LARGETURBINE_NEW_EMPTY6, - LARGETURBINE_NEW_EMPTY7, LARGETURBINE_NEW_EMPTY8, LARGETURBINE_NEW_EMPTY9 }, - TURBINE1 = { LARGETURBINE_SS1, LARGETURBINE_SS2, LARGETURBINE_SS3, LARGETURBINE_SS4, LARGETURBINE_SS5, - LARGETURBINE_SS6, LARGETURBINE_SS7, LARGETURBINE_SS8, LARGETURBINE_SS9 }, - TURBINE_ACTIVE1 = { LARGETURBINE_SS_ACTIVE1, LARGETURBINE_SS_ACTIVE2, LARGETURBINE_SS_ACTIVE3, - LARGETURBINE_SS_ACTIVE4, LARGETURBINE_SS_ACTIVE5, LARGETURBINE_SS_ACTIVE6, - LARGETURBINE_SS_ACTIVE7, LARGETURBINE_SS_ACTIVE8, LARGETURBINE_SS_ACTIVE9 }, - TURBINE_EMPTY1 = { LARGETURBINE_SS_EMPTY1, LARGETURBINE_SS_EMPTY2, LARGETURBINE_SS_EMPTY3, - LARGETURBINE_SS_EMPTY4, LARGETURBINE_SS_EMPTY5, LARGETURBINE_SS_EMPTY6, LARGETURBINE_SS_EMPTY7, - LARGETURBINE_SS_EMPTY8, LARGETURBINE_SS_EMPTY9 }, - TURBINE2 = { LARGETURBINE_TI1, LARGETURBINE_TI2, LARGETURBINE_TI3, LARGETURBINE_TI4, LARGETURBINE_TI5, - LARGETURBINE_TI6, LARGETURBINE_TI7, LARGETURBINE_TI8, LARGETURBINE_TI9 }, - TURBINE_ACTIVE2 = { LARGETURBINE_TI_ACTIVE1, LARGETURBINE_TI_ACTIVE2, LARGETURBINE_TI_ACTIVE3, - LARGETURBINE_TI_ACTIVE4, LARGETURBINE_TI_ACTIVE5, LARGETURBINE_TI_ACTIVE6, - LARGETURBINE_TI_ACTIVE7, LARGETURBINE_TI_ACTIVE8, LARGETURBINE_TI_ACTIVE9 }, - TURBINE_EMPTY2 = { LARGETURBINE_TI_EMPTY1, LARGETURBINE_TI_EMPTY2, LARGETURBINE_TI_EMPTY3, - LARGETURBINE_TI_EMPTY4, LARGETURBINE_TI_EMPTY5, LARGETURBINE_TI_EMPTY6, LARGETURBINE_TI_EMPTY7, - LARGETURBINE_TI_EMPTY8, LARGETURBINE_TI_EMPTY9 }, - TURBINE3 = { LARGETURBINE_TU1, LARGETURBINE_TU2, LARGETURBINE_TU3, LARGETURBINE_TU4, LARGETURBINE_TU5, - LARGETURBINE_TU6, LARGETURBINE_TU7, LARGETURBINE_TU8, LARGETURBINE_TU9 }, - TURBINE_ACTIVE3 = { LARGETURBINE_TU_ACTIVE1, LARGETURBINE_TU_ACTIVE2, LARGETURBINE_TU_ACTIVE3, - LARGETURBINE_TU_ACTIVE4, LARGETURBINE_TU_ACTIVE5, LARGETURBINE_TU_ACTIVE6, - LARGETURBINE_TU_ACTIVE7, LARGETURBINE_TU_ACTIVE8, LARGETURBINE_TU_ACTIVE9 }, - TURBINE_EMPTY3 = { LARGETURBINE_TU_EMPTY1, LARGETURBINE_TU_EMPTY2, LARGETURBINE_TU_EMPTY3, - LARGETURBINE_TU_EMPTY4, LARGETURBINE_TU_EMPTY5, LARGETURBINE_TU_EMPTY6, LARGETURBINE_TU_EMPTY7, - LARGETURBINE_TU_EMPTY8, LARGETURBINE_TU_EMPTY9 }, - TURBINEADVGAS = { LARGETURBINE_ADVGAS1, LARGETURBINE_ADVGAS2, LARGETURBINE_ADVGAS3, - LARGETURBINE_ADVGAS4, LARGETURBINE_ADVGAS5, LARGETURBINE_ADVGAS6, LARGETURBINE_ADVGAS7, - LARGETURBINE_ADVGAS8, LARGETURBINE_ADVGAS9 }, - TURBINE_ADVGASACTIVE = { LARGETURBINE_ADVGAS_ACTIVE1, LARGETURBINE_ADVGAS_ACTIVE2, - LARGETURBINE_ADVGAS_ACTIVE3, LARGETURBINE_ADVGAS_ACTIVE4, LARGETURBINE_ADVGAS_ACTIVE5, - LARGETURBINE_ADVGAS_ACTIVE6, LARGETURBINE_ADVGAS_ACTIVE7, LARGETURBINE_ADVGAS_ACTIVE8, - LARGETURBINE_ADVGAS_ACTIVE9 }, - TURBINE_ADVGASEMPTY = { LARGETURBINE_ADVGAS_EMPTY1, LARGETURBINE_ADVGAS_EMPTY2, - LARGETURBINE_ADVGAS_EMPTY3, LARGETURBINE_ADVGAS_EMPTY4, LARGETURBINE_ADVGAS_EMPTY5, - LARGETURBINE_ADVGAS_EMPTY6, LARGETURBINE_ADVGAS_EMPTY7, LARGETURBINE_ADVGAS_EMPTY8, - LARGETURBINE_ADVGAS_EMPTY9 }, - CONNECTED_HULLS = { CONCRETE_DARK_STONE, FUSIONI_1, FUSIONI_2, FUSIONI_3, FUSIONI_4, FUSIONI_5, - FUSIONI_6, FUSIONI_7, FUSIONI_8, FUSIONI_9, FUSIONI_10, FUSIONI_11, FUSIONI_12, FUSIONII_1, - FUSIONII_2, FUSIONII_3, FUSIONII_4, FUSIONII_5, FUSIONII_6, FUSIONII_7, FUSIONII_8, FUSIONII_9, - FUSIONII_10, FUSIONII_11, FUSIONII_12, }, - STORAGE_BLOCKS1 = { BLOCK_ADAMANTIUM, BLOCK_ALUMINIUM, BLOCK_AMERICIUM, BLOCK_ANNEALEDCOPPER, - BLOCK_ANTIMONY, BLOCK_ARSENIC, BLOCK_ASTRALSILVER, BLOCK_BATTERYALLOY, BLOCK_BERYLLIUM, - BLOCK_BISMUTH, BLOCK_BISMUTHBRONZE, BLOCK_BLACKBRONZE, BLOCK_BLACKSTEEL, BLOCK_BLUEALLOY, - BLOCK_BLUESTEEL, BLOCK_BRASS }, - STORAGE_BLOCKS2 = { BLOCK_BRONZE, BLOCK_CAESIUM, BLOCK_CERIUM, BLOCK_CHROME, BLOCK_CHROMIUMDIOXIDE, - BLOCK_COBALT, BLOCK_COBALTBRASS, BLOCK_COPPER, BLOCK_CUPRONICKEL, BLOCK_DAMASCUSSTEEL, - BLOCK_DARKIRON, BLOCK_DEEPIRON, BLOCK_DESH, BLOCK_DURANIUM, BLOCK_DYSPROSIUM, BLOCK_ELECTRUM }, - STORAGE_BLOCKS3 = { BLOCK_ELECTRUMFLUX, BLOCK_ENDERIUM, BLOCK_ERBIUM, BLOCK_EUROPIUM, BLOCK_FIERYSTEEL, - BLOCK_GADOLINIUM, BLOCK_GALLIUM, BLOCK_HOLMIUM, BLOCK_HSLA, BLOCK_INDIUM, BLOCK_INFUSEDGOLD, - BLOCK_INVAR, BLOCK_IRIDIUM, BLOCK_IRONMAGNETIC, BLOCK_IRONWOOD, BLOCK_KANTHAL }, - STORAGE_BLOCKS4 = { BLOCK_KNIGHTMETAL, BLOCK_LANTHANUM, BLOCK_LEAD, BLOCK_LUTETIUM, BLOCK_MAGNALIUM, - BLOCK_MAGNESIUM, BLOCK_MANGANESE, BLOCK_METEORICIRON, BLOCK_METEORICSTEEL, BLOCK_TRINIUM, - BLOCK_MITHRIL, BLOCK_MOLYBDENUM, BLOCK_NAQUADAH, BLOCK_NAQUADAHALLOY, BLOCK_NAQUADAHENRICHED, - BLOCK_NAQUADRIA }, - STORAGE_BLOCKS5 = { BLOCK_NEODYMIUM, BLOCK_NEODYMIUMMAGNETIC, BLOCK_NEUTRONIUM, BLOCK_NICHROME, - BLOCK_NICKEL, BLOCK_NIOBIUM, BLOCK_NIOBIUMNITRIDE, BLOCK_NIOBIUMTITANIUM, BLOCK_OSMIRIDIUM, - BLOCK_OSMIUM, BLOCK_PALLADIUM, BLOCK_PIGIRON, BLOCK_PLATINUM, BLOCK_PLUTONIUM, - BLOCK_PLUTONIUM241, BLOCK_PRASEODYMIUM }, - STORAGE_BLOCKS6 = { BLOCK_PROMETHIUM, BLOCK_REDALLOY, BLOCK_REDSTEEL, BLOCK_ROSEGOLD, BLOCK_RUBIDIUM, - BLOCK_SAMARIUM, BLOCK_SCANDIUM, BLOCK_SHADOWIRON, BLOCK_SHADOWSTEEL, BLOCK_SILICON, - BLOCK_SILVER, BLOCK_SOLDERINGALLOY, BLOCK_STAINLESSSTEEL, BLOCK_STEEL, BLOCK_STEELMAGNETIC, - BLOCK_STERLINGSILVER }, - STORAGE_BLOCKS7 = { BLOCK_SUNNARIUM, BLOCK_TANTALUM, BLOCK_TELLURIUM, BLOCK_TERBIUM, BLOCK_THAUMIUM, - BLOCK_THORIUM, BLOCK_THULIUM, BLOCK_TIN, BLOCK_TINALLOY, BLOCK_TITANIUM, BLOCK_TRITANIUM, - BLOCK_TUNGSTEN, BLOCK_TUNGSTENSTEEL, BLOCK_ULTIMET, BLOCK_URANIUM, BLOCK_URANIUM235 }, - STORAGE_BLOCKS8 = { BLOCK_VANADIUM, BLOCK_VANADIUMGALLIUM, BLOCK_WROUGHTIRON, BLOCK_YTTRBIUM, - BLOCK_YTTRIUM, BLOCK_YTTRIUMBARIUMCUPRATE, BLOCK_ZINC, BLOCK_TUNGSTENCARBIDE, - BLOCK_VANADIUMSTEEL, BLOCK_HSSG, BLOCK_HSSE, BLOCK_HSSS, BLOCK_STEELEAF, BLOCK_ICHORIUM, - BLOCK_FIRESTONE, BLOCK_SHADOW }, - STORAGE_BLOCKS9 = { BLOCK_AERCRYSTAL, BLOCK_AMBER, BLOCK_AMETHYST, BLOCK_AQUACRYSTAL, BLOCK_BLUETOPAZ, - BLOCK_CERTUSQUARTZ, BLOCK_DILITHIUM, BLOCK_ENDEREYE, BLOCK_ENDERPEARL, BLOCK_FOOLSRUBY, - BLOCK_FORCE, BLOCK_FORCICIUM, BLOCK_FORCILLIUM, BLOCK_GREENSAPPHIRE, BLOCK_IGNISCRYSTAL, - BLOCK_JASPER }, - STORAGE_BLOCKS10 = { BLOCK_LAZURITE, BLOCK_LIGNITE, BLOCK_MONAZITE, BLOCK_NITER, BLOCK_OLIVINE, - BLOCK_OPAL, BLOCK_ORDOCRYSTAL, BLOCK_PERDITIOCRYSTAL, BLOCK_PHOSPHORUS, BLOCK_QUARTZITE, - BLOCK_REDGARNET, BLOCK_RUBY, BLOCK_SAPPHIRE, BLOCK_SODALITE, BLOCK_TANZANITE, - BLOCK_TERRACRYSTAL }, - STORAGE_BLOCKS11 = { BLOCK_TOPAZ, BLOCK_VINTEUM, BLOCK_YELLOWGARNET, BLOCK_NETHERSTAR, BLOCK_CHARCOAL, - BLOCK_BLAZE }, - STORAGE_BLOCKS12 = { BLOCK_CRYOLITE, BLOCK_SILICONSG, BLOCK_NICKELALUMINIUM, BLOCK_SPACETIME, - BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER, - BLOCK_UNIVERSIUM }; + MACHINE_HV_SIDE, MACHINE_EV_SIDE, MACHINE_IV_SIDE, MACHINE_LuV_SIDE, MACHINE_ZPM_SIDE, MACHINE_UV_SIDE, + MACHINE_MAX_SIDE, MACHINE_UEV_SIDE, MACHINE_UIV_SIDE, MACHINE_UMV_SIDE, MACHINE_UXV_SIDE, + MACHINE_MAXV_SIDE, }, + MACHINECASINGS_TOP = { MACHINE_8V_TOP, MACHINE_LV_TOP, MACHINE_MV_TOP, MACHINE_HV_TOP, MACHINE_EV_TOP, + MACHINE_IV_TOP, MACHINE_LuV_TOP, MACHINE_ZPM_TOP, MACHINE_UV_TOP, MACHINE_MAX_TOP, MACHINE_UEV_TOP, + MACHINE_UIV_TOP, MACHINE_UMV_TOP, MACHINE_UXV_TOP, MACHINE_MAXV_TOP, }, + MACHINECASINGS_BOTTOM = { MACHINE_8V_BOTTOM, MACHINE_LV_BOTTOM, MACHINE_MV_BOTTOM, MACHINE_HV_BOTTOM, + MACHINE_EV_BOTTOM, MACHINE_IV_BOTTOM, MACHINE_LuV_BOTTOM, MACHINE_ZPM_BOTTOM, MACHINE_UV_BOTTOM, + MACHINE_MAX_BOTTOM, MACHINE_UEV_BOTTOM, MACHINE_UIV_BOTTOM, MACHINE_UMV_BOTTOM, MACHINE_UXV_BOTTOM, + MACHINE_MAXV_BOTTOM, }, + GRANITES = { GRANITE_BLACK_STONE, GRANITE_BLACK_COBBLE, GRANITE_BLACK_COBBLE_MOSSY, GRANITE_BLACK_BRICKS, + GRANITE_BLACK_BRICKS_CRACKED, GRANITE_BLACK_BRICKS_MOSSY, GRANITE_BLACK_BRICKS_CHISELED, + GRANITE_BLACK_SMOOTH, GRANITE_RED_STONE, GRANITE_RED_COBBLE, GRANITE_RED_COBBLE_MOSSY, + GRANITE_RED_BRICKS, GRANITE_RED_BRICKS_CRACKED, GRANITE_RED_BRICKS_MOSSY, GRANITE_RED_BRICKS_CHISELED, + GRANITE_RED_SMOOTH, }, + CONCRETES = { CONCRETE_DARK_STONE, CONCRETE_DARK_COBBLE, CONCRETE_DARK_COBBLE_MOSSY, CONCRETE_DARK_BRICKS, + CONCRETE_DARK_BRICKS_CRACKED, CONCRETE_DARK_BRICKS_MOSSY, CONCRETE_DARK_BRICKS_CHISELED, + CONCRETE_DARK_SMOOTH, CONCRETE_LIGHT_STONE, CONCRETE_LIGHT_COBBLE, CONCRETE_LIGHT_COBBLE_MOSSY, + CONCRETE_LIGHT_BRICKS, CONCRETE_LIGHT_BRICKS_CRACKED, CONCRETE_LIGHT_BRICKS_MOSSY, + CONCRETE_LIGHT_BRICKS_CHISELED, CONCRETE_LIGHT_SMOOTH, }, + STONES = { MARBLE_STONE, MARBLE_COBBLE, MARBLE_COBBLE_MOSSY, MARBLE_BRICKS, MARBLE_BRICKS_CRACKED, + MARBLE_BRICKS_MOSSY, MARBLE_BRICKS_CHISELED, MARBLE_SMOOTH, BASALT_STONE, BASALT_COBBLE, + BASALT_COBBLE_MOSSY, BASALT_BRICKS, BASALT_BRICKS_CRACKED, BASALT_BRICKS_MOSSY, BASALT_BRICKS_CHISELED, + BASALT_SMOOTH, }, + TURBINE = { LARGETURBINE_ST1, LARGETURBINE_ST2, LARGETURBINE_ST3, LARGETURBINE_ST4, LARGETURBINE_ST5, + LARGETURBINE_ST6, LARGETURBINE_ST7, LARGETURBINE_ST8, LARGETURBINE_ST9 }, + TURBINE_ACTIVE = { LARGETURBINE_ST_ACTIVE1, LARGETURBINE_ST_ACTIVE2, LARGETURBINE_ST_ACTIVE3, + LARGETURBINE_ST_ACTIVE4, LARGETURBINE_ST_ACTIVE5, LARGETURBINE_ST_ACTIVE6, LARGETURBINE_ST_ACTIVE7, + LARGETURBINE_ST_ACTIVE8, LARGETURBINE_ST_ACTIVE9 }, + TURBINE_EMPTY = { LARGETURBINE_ST_EMPTY1, LARGETURBINE_ST_EMPTY2, LARGETURBINE_ST_EMPTY3, + LARGETURBINE_ST_EMPTY4, LARGETURBINE_ST_EMPTY5, LARGETURBINE_ST_EMPTY6, LARGETURBINE_ST_EMPTY7, + LARGETURBINE_ST_EMPTY8, LARGETURBINE_ST_EMPTY9 }, + TURBINE_NEW = { LARGETURBINE_NEW1, LARGETURBINE_NEW2, LARGETURBINE_NEW3, LARGETURBINE_NEW4, + LARGETURBINE_NEW5, LARGETURBINE_NEW6, LARGETURBINE_NEW7, LARGETURBINE_NEW8, LARGETURBINE_NEW9 }, + TURBINE_NEW_ACTIVE = { LARGETURBINE_NEW_ACTIVE1, LARGETURBINE_NEW_ACTIVE2, LARGETURBINE_NEW_ACTIVE3, + LARGETURBINE_NEW_ACTIVE4, LARGETURBINE_NEW_ACTIVE5, LARGETURBINE_NEW_ACTIVE6, LARGETURBINE_NEW_ACTIVE7, + LARGETURBINE_NEW_ACTIVE8, LARGETURBINE_NEW_ACTIVE9 }, + TURBINE_NEW_EMPTY = { LARGETURBINE_NEW_EMPTY1, LARGETURBINE_NEW_EMPTY2, LARGETURBINE_NEW_EMPTY3, + LARGETURBINE_NEW_EMPTY4, LARGETURBINE_NEW_EMPTY5, LARGETURBINE_NEW_EMPTY6, LARGETURBINE_NEW_EMPTY7, + LARGETURBINE_NEW_EMPTY8, LARGETURBINE_NEW_EMPTY9 }, + TURBINE1 = { LARGETURBINE_SS1, LARGETURBINE_SS2, LARGETURBINE_SS3, LARGETURBINE_SS4, LARGETURBINE_SS5, + LARGETURBINE_SS6, LARGETURBINE_SS7, LARGETURBINE_SS8, LARGETURBINE_SS9 }, + TURBINE_ACTIVE1 = { LARGETURBINE_SS_ACTIVE1, LARGETURBINE_SS_ACTIVE2, LARGETURBINE_SS_ACTIVE3, + LARGETURBINE_SS_ACTIVE4, LARGETURBINE_SS_ACTIVE5, LARGETURBINE_SS_ACTIVE6, LARGETURBINE_SS_ACTIVE7, + LARGETURBINE_SS_ACTIVE8, LARGETURBINE_SS_ACTIVE9 }, + TURBINE_EMPTY1 = { LARGETURBINE_SS_EMPTY1, LARGETURBINE_SS_EMPTY2, LARGETURBINE_SS_EMPTY3, + LARGETURBINE_SS_EMPTY4, LARGETURBINE_SS_EMPTY5, LARGETURBINE_SS_EMPTY6, LARGETURBINE_SS_EMPTY7, + LARGETURBINE_SS_EMPTY8, LARGETURBINE_SS_EMPTY9 }, + TURBINE2 = { LARGETURBINE_TI1, LARGETURBINE_TI2, LARGETURBINE_TI3, LARGETURBINE_TI4, LARGETURBINE_TI5, + LARGETURBINE_TI6, LARGETURBINE_TI7, LARGETURBINE_TI8, LARGETURBINE_TI9 }, + TURBINE_ACTIVE2 = { LARGETURBINE_TI_ACTIVE1, LARGETURBINE_TI_ACTIVE2, LARGETURBINE_TI_ACTIVE3, + LARGETURBINE_TI_ACTIVE4, LARGETURBINE_TI_ACTIVE5, LARGETURBINE_TI_ACTIVE6, LARGETURBINE_TI_ACTIVE7, + LARGETURBINE_TI_ACTIVE8, LARGETURBINE_TI_ACTIVE9 }, + TURBINE_EMPTY2 = { LARGETURBINE_TI_EMPTY1, LARGETURBINE_TI_EMPTY2, LARGETURBINE_TI_EMPTY3, + LARGETURBINE_TI_EMPTY4, LARGETURBINE_TI_EMPTY5, LARGETURBINE_TI_EMPTY6, LARGETURBINE_TI_EMPTY7, + LARGETURBINE_TI_EMPTY8, LARGETURBINE_TI_EMPTY9 }, + TURBINE3 = { LARGETURBINE_TU1, LARGETURBINE_TU2, LARGETURBINE_TU3, LARGETURBINE_TU4, LARGETURBINE_TU5, + LARGETURBINE_TU6, LARGETURBINE_TU7, LARGETURBINE_TU8, LARGETURBINE_TU9 }, + TURBINE_ACTIVE3 = { LARGETURBINE_TU_ACTIVE1, LARGETURBINE_TU_ACTIVE2, LARGETURBINE_TU_ACTIVE3, + LARGETURBINE_TU_ACTIVE4, LARGETURBINE_TU_ACTIVE5, LARGETURBINE_TU_ACTIVE6, LARGETURBINE_TU_ACTIVE7, + LARGETURBINE_TU_ACTIVE8, LARGETURBINE_TU_ACTIVE9 }, + TURBINE_EMPTY3 = { LARGETURBINE_TU_EMPTY1, LARGETURBINE_TU_EMPTY2, LARGETURBINE_TU_EMPTY3, + LARGETURBINE_TU_EMPTY4, LARGETURBINE_TU_EMPTY5, LARGETURBINE_TU_EMPTY6, LARGETURBINE_TU_EMPTY7, + LARGETURBINE_TU_EMPTY8, LARGETURBINE_TU_EMPTY9 }, + TURBINEADVGAS = { LARGETURBINE_ADVGAS1, LARGETURBINE_ADVGAS2, LARGETURBINE_ADVGAS3, LARGETURBINE_ADVGAS4, + LARGETURBINE_ADVGAS5, LARGETURBINE_ADVGAS6, LARGETURBINE_ADVGAS7, LARGETURBINE_ADVGAS8, + LARGETURBINE_ADVGAS9 }, + TURBINE_ADVGASACTIVE = { LARGETURBINE_ADVGAS_ACTIVE1, LARGETURBINE_ADVGAS_ACTIVE2, + LARGETURBINE_ADVGAS_ACTIVE3, LARGETURBINE_ADVGAS_ACTIVE4, LARGETURBINE_ADVGAS_ACTIVE5, + LARGETURBINE_ADVGAS_ACTIVE6, LARGETURBINE_ADVGAS_ACTIVE7, LARGETURBINE_ADVGAS_ACTIVE8, + LARGETURBINE_ADVGAS_ACTIVE9 }, + TURBINE_ADVGASEMPTY = { LARGETURBINE_ADVGAS_EMPTY1, LARGETURBINE_ADVGAS_EMPTY2, LARGETURBINE_ADVGAS_EMPTY3, + LARGETURBINE_ADVGAS_EMPTY4, LARGETURBINE_ADVGAS_EMPTY5, LARGETURBINE_ADVGAS_EMPTY6, + LARGETURBINE_ADVGAS_EMPTY7, LARGETURBINE_ADVGAS_EMPTY8, LARGETURBINE_ADVGAS_EMPTY9 }, + CONNECTED_HULLS = { CONCRETE_DARK_STONE, FUSIONI_1, FUSIONI_2, FUSIONI_3, FUSIONI_4, FUSIONI_5, FUSIONI_6, + FUSIONI_7, FUSIONI_8, FUSIONI_9, FUSIONI_10, FUSIONI_11, FUSIONI_12, FUSIONII_1, FUSIONII_2, FUSIONII_3, + FUSIONII_4, FUSIONII_5, FUSIONII_6, FUSIONII_7, FUSIONII_8, FUSIONII_9, FUSIONII_10, FUSIONII_11, + FUSIONII_12, }, + STORAGE_BLOCKS1 = { BLOCK_ADAMANTIUM, BLOCK_ALUMINIUM, BLOCK_AMERICIUM, BLOCK_ANNEALEDCOPPER, + BLOCK_ANTIMONY, BLOCK_ARSENIC, BLOCK_ASTRALSILVER, BLOCK_BATTERYALLOY, BLOCK_BERYLLIUM, BLOCK_BISMUTH, + BLOCK_BISMUTHBRONZE, BLOCK_BLACKBRONZE, BLOCK_BLACKSTEEL, BLOCK_BLUEALLOY, BLOCK_BLUESTEEL, + BLOCK_BRASS }, + STORAGE_BLOCKS2 = { BLOCK_BRONZE, BLOCK_CAESIUM, BLOCK_CERIUM, BLOCK_CHROME, BLOCK_CHROMIUMDIOXIDE, + BLOCK_COBALT, BLOCK_COBALTBRASS, BLOCK_COPPER, BLOCK_CUPRONICKEL, BLOCK_DAMASCUSSTEEL, BLOCK_DARKIRON, + BLOCK_DEEPIRON, BLOCK_DESH, BLOCK_DURANIUM, BLOCK_DYSPROSIUM, BLOCK_ELECTRUM }, + STORAGE_BLOCKS3 = { BLOCK_ELECTRUMFLUX, BLOCK_ENDERIUM, BLOCK_ERBIUM, BLOCK_EUROPIUM, BLOCK_FIERYSTEEL, + BLOCK_GADOLINIUM, BLOCK_GALLIUM, BLOCK_HOLMIUM, BLOCK_HSLA, BLOCK_INDIUM, BLOCK_INFUSEDGOLD, + BLOCK_INVAR, BLOCK_IRIDIUM, BLOCK_IRONMAGNETIC, BLOCK_IRONWOOD, BLOCK_KANTHAL }, + STORAGE_BLOCKS4 = { BLOCK_KNIGHTMETAL, BLOCK_LANTHANUM, BLOCK_LEAD, BLOCK_LUTETIUM, BLOCK_MAGNALIUM, + BLOCK_MAGNESIUM, BLOCK_MANGANESE, BLOCK_METEORICIRON, BLOCK_METEORICSTEEL, BLOCK_TRINIUM, BLOCK_MITHRIL, + BLOCK_MOLYBDENUM, BLOCK_NAQUADAH, BLOCK_NAQUADAHALLOY, BLOCK_NAQUADAHENRICHED, BLOCK_NAQUADRIA }, + STORAGE_BLOCKS5 = { BLOCK_NEODYMIUM, BLOCK_NEODYMIUMMAGNETIC, BLOCK_NEUTRONIUM, BLOCK_NICHROME, + BLOCK_NICKEL, BLOCK_NIOBIUM, BLOCK_NIOBIUMNITRIDE, BLOCK_NIOBIUMTITANIUM, BLOCK_OSMIRIDIUM, + BLOCK_OSMIUM, BLOCK_PALLADIUM, BLOCK_PIGIRON, BLOCK_PLATINUM, BLOCK_PLUTONIUM, BLOCK_PLUTONIUM241, + BLOCK_PRASEODYMIUM }, + STORAGE_BLOCKS6 = { BLOCK_PROMETHIUM, BLOCK_REDALLOY, BLOCK_REDSTEEL, BLOCK_ROSEGOLD, BLOCK_RUBIDIUM, + BLOCK_SAMARIUM, BLOCK_SCANDIUM, BLOCK_SHADOWIRON, BLOCK_SHADOWSTEEL, BLOCK_SILICON, BLOCK_SILVER, + BLOCK_SOLDERINGALLOY, BLOCK_STAINLESSSTEEL, BLOCK_STEEL, BLOCK_STEELMAGNETIC, BLOCK_STERLINGSILVER }, + STORAGE_BLOCKS7 = { BLOCK_SUNNARIUM, BLOCK_TANTALUM, BLOCK_TELLURIUM, BLOCK_TERBIUM, BLOCK_THAUMIUM, + BLOCK_THORIUM, BLOCK_THULIUM, BLOCK_TIN, BLOCK_TINALLOY, BLOCK_TITANIUM, BLOCK_TRITANIUM, + BLOCK_TUNGSTEN, BLOCK_TUNGSTENSTEEL, BLOCK_ULTIMET, BLOCK_URANIUM, BLOCK_URANIUM235 }, + STORAGE_BLOCKS8 = { BLOCK_VANADIUM, BLOCK_VANADIUMGALLIUM, BLOCK_WROUGHTIRON, BLOCK_YTTRBIUM, BLOCK_YTTRIUM, + BLOCK_YTTRIUMBARIUMCUPRATE, BLOCK_ZINC, BLOCK_TUNGSTENCARBIDE, BLOCK_VANADIUMSTEEL, BLOCK_HSSG, + BLOCK_HSSE, BLOCK_HSSS, BLOCK_STEELEAF, BLOCK_ICHORIUM, BLOCK_FIRESTONE, BLOCK_SHADOW }, + STORAGE_BLOCKS9 = { BLOCK_AERCRYSTAL, BLOCK_AMBER, BLOCK_AMETHYST, BLOCK_AQUACRYSTAL, BLOCK_BLUETOPAZ, + BLOCK_CERTUSQUARTZ, BLOCK_DILITHIUM, BLOCK_ENDEREYE, BLOCK_ENDERPEARL, BLOCK_FOOLSRUBY, BLOCK_FORCE, + BLOCK_FORCICIUM, BLOCK_FORCILLIUM, BLOCK_GREENSAPPHIRE, BLOCK_IGNISCRYSTAL, BLOCK_JASPER }, + STORAGE_BLOCKS10 = { BLOCK_LAZURITE, BLOCK_LIGNITE, BLOCK_MONAZITE, BLOCK_NITER, BLOCK_OLIVINE, BLOCK_OPAL, + BLOCK_ORDOCRYSTAL, BLOCK_PERDITIOCRYSTAL, BLOCK_PHOSPHORUS, BLOCK_QUARTZITE, BLOCK_REDGARNET, + BLOCK_RUBY, BLOCK_SAPPHIRE, BLOCK_SODALITE, BLOCK_TANZANITE, BLOCK_TERRACRYSTAL }, + STORAGE_BLOCKS11 = { BLOCK_TOPAZ, BLOCK_VINTEUM, BLOCK_YELLOWGARNET, BLOCK_NETHERSTAR, BLOCK_CHARCOAL, + BLOCK_BLAZE }, + STORAGE_BLOCKS12 = { BLOCK_CRYOLITE, BLOCK_SILICONSG, BLOCK_NICKELALUMINIUM, BLOCK_SPACETIME, + BLOCK_TRANSCENDENTMETAL, BLOCK_ORIHARUKON, BLOCK_WHITEDWARFMATTER, BLOCK_BLACKDWARFMATTER, + BLOCK_UNIVERSIUM }; public static final ITexture[] HIDDEN_TEXTURE = { TextureFactory.builder() - .addIcon(HIDDEN_FACE) - .stdOrient() - .build() }; + .addIcon(HIDDEN_FACE) + .stdOrient() + .build() }; public static final ITexture[] ERROR_RENDERING = { TextureFactory.of(RENDERING_ERROR) }; public static final ITexture[] OVERLAYS_ENERGY_IN = { - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 180, 180, 180, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 220, 220, 220, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 255, 100, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 255, 255, 30, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 128, 128, 128, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 240, 240, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 220, 220, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 200, 200, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 180, 180, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 160, 160, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 140, 140, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 120, 120, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 100, 100, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 80, 80, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 60, 60, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 40, 40, 245, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 180, 180, 180, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 220, 220, 220, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 255, 100, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 255, 255, 30, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 128, 128, 128, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 240, 240, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 220, 220, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 200, 200, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 180, 180, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 160, 160, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 140, 140, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 120, 120, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 100, 100, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 80, 80, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 60, 60, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN, new short[] { 40, 40, 245, 0 }), }; public static ITexture[] OVERLAYS_ENERGY_OUT = { - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 180, 180, 180, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 220, 220, 220, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 255, 100, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 255, 255, 30, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 128, 128, 128, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 240, 240, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 220, 220, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 200, 200, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 180, 180, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 160, 160, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 140, 140, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 120, 120, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 100, 100, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 80, 80, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 60, 60, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 40, 40, 245, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 180, 180, 180, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 220, 220, 220, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 255, 100, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 255, 255, 30, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 128, 128, 128, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 240, 240, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 220, 220, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 200, 200, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 180, 180, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 160, 160, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 140, 140, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 120, 120, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 100, 100, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 80, 80, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 60, 60, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT, new short[] { 40, 40, 245, 0 }), }; public static final ITexture[] OVERLAYS_ENERGY_IN_MULTI = { - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 180, 180, 180, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 220, 220, 220, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 255, 100, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 255, 255, 30, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 128, 128, 128, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 240, 240, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 220, 220, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 200, 200, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 180, 180, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 160, 160, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 140, 140, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 120, 120, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 100, 100, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 80, 80, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 60, 60, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 40, 40, 245, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 180, 180, 180, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 220, 220, 220, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 255, 100, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 255, 255, 30, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 128, 128, 128, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 240, 240, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 220, 220, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 200, 200, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 180, 180, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 160, 160, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 140, 140, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 120, 120, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 100, 100, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 80, 80, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 60, 60, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_MULTI, new short[] { 40, 40, 245, 0 }), }; public static final ITexture[] OVERLAYS_ENERGY_IN_MULTI_WIRELESS_ON = { - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), - TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), + TextureFactory.of(OVERLAY_ENERGY_ON_WIRELESS, new short[] { 255, 255, 255, 0 }), }; public static final ITexture[] OVERLAYS_ENERGY_IN_MULTI_WIRELESS_OFF = { - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OFF_WIRELESS, new short[] { 0, 0, 0, 0 }), }; public static final ITexture[] OVERLAYS_ENERGY_OUT_MULTI = { - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 180, 180, 180, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 220, 220, 220, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 255, 100, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 255, 255, 30, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 128, 128, 128, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 240, 240, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 220, 220, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 200, 200, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 180, 180, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 160, 160, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 140, 140, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 120, 120, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 100, 100, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 80, 80, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 60, 60, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 40, 40, 245, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 180, 180, 180, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 220, 220, 220, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 255, 100, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 255, 255, 30, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 128, 128, 128, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 240, 240, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 220, 220, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 200, 200, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 180, 180, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 160, 160, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 140, 140, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 120, 120, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 100, 100, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 80, 80, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 60, 60, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_MULTI, new short[] { 40, 40, 245, 0 }), }; public static final ITexture[] OVERLAYS_ENERGY_IN_POWER = { - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 180, 180, 180, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 220, 220, 220, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 255, 100, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 255, 255, 30, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 128, 128, 128, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 240, 240, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 220, 220, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 200, 200, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 180, 180, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 160, 160, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 140, 140, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 120, 120, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 100, 100, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 80, 80, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 60, 60, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 40, 40, 245, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 180, 180, 180, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 220, 220, 220, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 255, 100, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 255, 255, 30, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 128, 128, 128, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 240, 240, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 220, 220, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 200, 200, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 180, 180, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 160, 160, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 140, 140, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 120, 120, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 100, 100, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 80, 80, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 60, 60, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_IN_POWER, new short[] { 40, 40, 245, 0 }), }; public static final ITexture[] OVERLAYS_ENERGY_OUT_POWER = { - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 180, 180, 180, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 220, 220, 220, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 255, 100, 0, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 255, 255, 30, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 128, 128, 128, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 240, 240, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 220, 220, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 200, 200, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 180, 180, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 160, 160, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 140, 140, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 120, 120, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 100, 100, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 80, 80, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 60, 60, 245, 0 }), - TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 40, 40, 245, 0 }), }; + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 180, 180, 180, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 220, 220, 220, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 255, 100, 0, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 255, 255, 30, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 128, 128, 128, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 240, 240, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 220, 220, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 200, 200, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 180, 180, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 160, 160, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 140, 140, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 120, 120, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 100, 100, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 80, 80, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 60, 60, 245, 0 }), + TextureFactory.of(OVERLAY_ENERGY_OUT_POWER, new short[] { 40, 40, 245, 0 }), }; public static final ITexture[] LOCKERS = { TextureFactory.of(OVERLAY_LOCKER_000), - TextureFactory.of(OVERLAY_LOCKER_001), TextureFactory.of(OVERLAY_LOCKER_002), - TextureFactory.of(OVERLAY_LOCKER_003), TextureFactory.of(OVERLAY_LOCKER_004), - TextureFactory.of(OVERLAY_LOCKER_005), TextureFactory.of(OVERLAY_LOCKER_006), - TextureFactory.of(OVERLAY_LOCKER_007), TextureFactory.of(OVERLAY_LOCKER_008), - TextureFactory.of(OVERLAY_LOCKER_009), TextureFactory.of(OVERLAY_LOCKER_010), - TextureFactory.of(OVERLAY_LOCKER_011), TextureFactory.of(OVERLAY_LOCKER_012), - TextureFactory.of(OVERLAY_LOCKER_013), }; + TextureFactory.of(OVERLAY_LOCKER_001), TextureFactory.of(OVERLAY_LOCKER_002), + TextureFactory.of(OVERLAY_LOCKER_003), TextureFactory.of(OVERLAY_LOCKER_004), + TextureFactory.of(OVERLAY_LOCKER_005), TextureFactory.of(OVERLAY_LOCKER_006), + TextureFactory.of(OVERLAY_LOCKER_007), TextureFactory.of(OVERLAY_LOCKER_008), + TextureFactory.of(OVERLAY_LOCKER_009), TextureFactory.of(OVERLAY_LOCKER_010), + TextureFactory.of(OVERLAY_LOCKER_011), TextureFactory.of(OVERLAY_LOCKER_012), + TextureFactory.of(OVERLAY_LOCKER_013), }; /** * USE casingTexturePages[page] instead of CASING_BLOCKS since it is casingTexturePages[0] */ @@ -1671,10 +1664,10 @@ public class Textures { static { for (byte i = 0; i < MACHINE_CASINGS.length; i++) for (byte j = 0; j < MACHINE_CASINGS[i].length; j++) MACHINE_CASINGS[i][j] = TextureFactory.of( - MACHINECASINGS_BOTTOM[i], - MACHINECASINGS_TOP[i], - MACHINECASINGS_SIDE[i], - Dyes.getModulation(j - 1, Dyes.MACHINE_METAL.mRGBa)); + MACHINECASINGS_BOTTOM[i], + MACHINECASINGS_TOP[i], + MACHINECASINGS_SIDE[i], + Dyes.getModulation(j - 1, Dyes.MACHINE_METAL.mRGBa)); casingTexturePages[0] = new ITexture[128]; // adds some known pages, modders also can do it... GT_Utility.addTexturePage((byte) 1); @@ -1820,10 +1813,10 @@ public class Textures { HALO_FUZZY; public static final IIconContainer[] DURABILITY_BAR = { 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 = { 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, }; + DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, + DURABILITY_BAR_8, }, + ENERGY_BAR = { 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 ITexture[] ERROR_RENDERING = { TextureFactory.of(RENDERING_ERROR) }; diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java index 3af005750b..870e8dafbb 100644 --- a/src/main/java/gregtech/api/enums/Tier.java +++ b/src/main/java/gregtech/api/enums/Tier.java @@ -8,440 +8,440 @@ import static gregtech.api.enums.GT_Values.V; public class Tier { public static final Tier[] ELECTRIC = new Tier[] { - new Tier( - SubTag.ENERGY_ELECTRICITY, - 0, - V[0], - 1, - 1, - 1, - Materials.WroughtIron, - ItemList.Hull_ULV, - OrePrefixes.cableGt01.get(Materials.Lead), - OrePrefixes.cableGt04.get(Materials.Lead), - OrePrefixes.circuit.get(Materials.Primitive), - OrePrefixes.circuit.get(Materials.Basic)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 1, - V[1], - 1, - 1, - 1, - Materials.Steel, - ItemList.Hull_LV, - OrePrefixes.cableGt01.get(Materials.Tin), - OrePrefixes.cableGt04.get(Materials.Tin), - OrePrefixes.circuit.get(Materials.Basic), - OrePrefixes.circuit.get(Materials.Good)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 2, - V[2], - 1, - 1, - 1, - Materials.Aluminium, - ItemList.Hull_MV, - OrePrefixes.cableGt01.get(Materials.AnyCopper), - OrePrefixes.cableGt04.get(Materials.AnyCopper), - OrePrefixes.circuit.get(Materials.Good), - OrePrefixes.circuit.get(Materials.Advanced)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 3, - V[3], - 1, - 1, - 1, - Materials.StainlessSteel, - ItemList.Hull_HV, - OrePrefixes.cableGt01.get(Materials.Gold), - OrePrefixes.cableGt04.get(Materials.Gold), - OrePrefixes.circuit.get(Materials.Advanced), - OrePrefixes.circuit.get(Materials.Data)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 4, - V[4], - 1, - 1, - 1, - Materials.Titanium, - ItemList.Hull_EV, - OrePrefixes.cableGt01.get(Materials.Aluminium), - OrePrefixes.cableGt04.get(Materials.Aluminium), - OrePrefixes.circuit.get(Materials.Data), - OrePrefixes.circuit.get(Materials.Elite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 5, - V[5], - 1, - 1, - 1, - Materials.TungstenSteel, - ItemList.Hull_IV, - OrePrefixes.cableGt01.get(Materials.Platinum), - OrePrefixes.cableGt04.get(Materials.Platinum), - OrePrefixes.circuit.get(Materials.Elite), - OrePrefixes.circuit.get(Materials.Master)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 6, - V[6], - 1, - 1, - 1, - Materials.Chrome, - ItemList.Hull_LuV, - OrePrefixes.cableGt01.get(Materials.NiobiumTitanium), - OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), - OrePrefixes.circuit.get(Materials.Master), - OrePrefixes.circuit.get(Materials.Ultimate)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 7, - V[7], - 1, - 1, - 1, - Materials.Iridium, - ItemList.Hull_ZPM, - OrePrefixes.cableGt01.get(Materials.Naquadah), - OrePrefixes.cableGt04.get(Materials.Naquadah), - OrePrefixes.circuit.get(Materials.Ultimate), - OrePrefixes.circuit.get(Materials.Superconductor)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 8, - V[8], - 1, - 1, - 1, - Materials.Osmium, - ItemList.Hull_UV, - OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Superconductor), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 9, - V[9], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 10, - V[10], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 11, - V[11], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 12, - V[12], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 13, - V[13], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 14, - V[14], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), - new Tier( - SubTag.ENERGY_ELECTRICITY, - 15, - V[15], - 1, - 1, - 1, - Materials.Neutronium, - ItemList.Hull_MAX, - OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), - OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), - OrePrefixes.circuit.get(Materials.Infinite), - OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 0, + V[0], + 1, + 1, + 1, + Materials.WroughtIron, + ItemList.Hull_ULV, + OrePrefixes.cableGt01.get(Materials.Lead), + OrePrefixes.cableGt04.get(Materials.Lead), + OrePrefixes.circuit.get(Materials.Primitive), + OrePrefixes.circuit.get(Materials.Basic)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 1, + V[1], + 1, + 1, + 1, + Materials.Steel, + ItemList.Hull_LV, + OrePrefixes.cableGt01.get(Materials.Tin), + OrePrefixes.cableGt04.get(Materials.Tin), + OrePrefixes.circuit.get(Materials.Basic), + OrePrefixes.circuit.get(Materials.Good)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 2, + V[2], + 1, + 1, + 1, + Materials.Aluminium, + ItemList.Hull_MV, + OrePrefixes.cableGt01.get(Materials.AnyCopper), + OrePrefixes.cableGt04.get(Materials.AnyCopper), + OrePrefixes.circuit.get(Materials.Good), + OrePrefixes.circuit.get(Materials.Advanced)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 3, + V[3], + 1, + 1, + 1, + Materials.StainlessSteel, + ItemList.Hull_HV, + OrePrefixes.cableGt01.get(Materials.Gold), + OrePrefixes.cableGt04.get(Materials.Gold), + OrePrefixes.circuit.get(Materials.Advanced), + OrePrefixes.circuit.get(Materials.Data)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 4, + V[4], + 1, + 1, + 1, + Materials.Titanium, + ItemList.Hull_EV, + OrePrefixes.cableGt01.get(Materials.Aluminium), + OrePrefixes.cableGt04.get(Materials.Aluminium), + OrePrefixes.circuit.get(Materials.Data), + OrePrefixes.circuit.get(Materials.Elite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 5, + V[5], + 1, + 1, + 1, + Materials.TungstenSteel, + ItemList.Hull_IV, + OrePrefixes.cableGt01.get(Materials.Platinum), + OrePrefixes.cableGt04.get(Materials.Platinum), + OrePrefixes.circuit.get(Materials.Elite), + OrePrefixes.circuit.get(Materials.Master)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 6, + V[6], + 1, + 1, + 1, + Materials.Chrome, + ItemList.Hull_LuV, + OrePrefixes.cableGt01.get(Materials.NiobiumTitanium), + OrePrefixes.cableGt04.get(Materials.NiobiumTitanium), + OrePrefixes.circuit.get(Materials.Master), + OrePrefixes.circuit.get(Materials.Ultimate)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 7, + V[7], + 1, + 1, + 1, + Materials.Iridium, + ItemList.Hull_ZPM, + OrePrefixes.cableGt01.get(Materials.Naquadah), + OrePrefixes.cableGt04.get(Materials.Naquadah), + OrePrefixes.circuit.get(Materials.Ultimate), + OrePrefixes.circuit.get(Materials.Superconductor)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 8, + V[8], + 1, + 1, + 1, + Materials.Osmium, + ItemList.Hull_UV, + OrePrefixes.cableGt04.get(Materials.NaquadahAlloy), + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Superconductor), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 9, + V[9], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 10, + V[10], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 11, + V[11], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 12, + V[12], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 13, + V[13], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 14, + V[14], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), + new Tier( + SubTag.ENERGY_ELECTRICITY, + 15, + V[15], + 1, + 1, + 1, + Materials.Neutronium, + ItemList.Hull_MAX, + OrePrefixes.wireGt01.get(Materials.SuperconductorUHV), + OrePrefixes.wireGt04.get(Materials.SuperconductorUHV), + OrePrefixes.circuit.get(Materials.Infinite), + OrePrefixes.circuit.get(Materials.Infinite)), - // READ GT_VALUES CLASS BEFORE YOU START ADDING STUFF TO TIERS 8+ - and probably dont do it in - // GT but in GTNH core mod - that way we shouldnt need to set the tier class + // READ GT_VALUES CLASS BEFORE YOU START ADDING STUFF TO TIERS 8+ - and probably dont do it in + // GT but in GTNH core mod - that way we shouldnt need to set the tier class }, ROTATIONAL = new Tier[] { + new Tier( + SubTag.ENERGY_ROTATIONAL, + 1, + 32, + 1, + 1, + 1, + Materials.Wood, + OrePrefixes.frameGt.get(Materials.Wood), + OrePrefixes.stick.get(Materials.Wood), + OrePrefixes.ingot.get(Materials.Wood), + OrePrefixes.gearGt.get(Materials.Wood), + OrePrefixes.gearGt.get(Materials.Stone)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 1, + 32, + 1, + 2, + 2, + Materials.WoodSealed, + OrePrefixes.frameGt.get(Materials.WoodSealed), + OrePrefixes.stick.get(Materials.WoodSealed), + OrePrefixes.ingot.get(Materials.WoodSealed), + OrePrefixes.gearGt.get(Materials.WoodSealed), + OrePrefixes.gearGt.get(Materials.Stone)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 2, + 128, + 1, + 1, + 1, + Materials.Stone, + OrePrefixes.frameGt.get(Materials.Stone), + OrePrefixes.stick.get(Materials.Stone), + OrePrefixes.ingot.get(Materials.Stone), + OrePrefixes.gearGt.get(Materials.Stone), + OrePrefixes.gearGt.get(Materials.Bronze)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 2, + 128, + 1, + 2, + 2, + Materials.IronWood, + OrePrefixes.frameGt.get(Materials.IronWood), + OrePrefixes.stick.get(Materials.IronWood), + OrePrefixes.ingot.get(Materials.IronWood), + OrePrefixes.gearGt.get(Materials.IronWood), + OrePrefixes.gearGt.get(Materials.Bronze)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 3, + 512, + 1, + 1, + 1, + Materials.Bronze, + OrePrefixes.frameGt.get(Materials.Bronze), + OrePrefixes.stick.get(Materials.Bronze), + OrePrefixes.ingot.get(Materials.Bronze), + OrePrefixes.gearGt.get(Materials.Bronze), + OrePrefixes.gearGt.get(Materials.Steel)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 3, + 512, + 1, + 2, + 2, + Materials.Brass, + OrePrefixes.frameGt.get(Materials.Brass), + OrePrefixes.stick.get(Materials.Brass), + OrePrefixes.ingot.get(Materials.Brass), + OrePrefixes.gearGt.get(Materials.Brass), + OrePrefixes.gearGt.get(Materials.Steel)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 4, + 2048, + 1, + 1, + 1, + Materials.Steel, + OrePrefixes.frameGt.get(Materials.Steel), + OrePrefixes.stick.get(Materials.Steel), + OrePrefixes.ingot.get(Materials.Steel), + OrePrefixes.gearGt.get(Materials.Steel), + OrePrefixes.gearGt.get(Materials.TungstenSteel)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 4, + 2048, + 1, + 2, + 2, + Materials.Titanium, + OrePrefixes.frameGt.get(Materials.Titanium), + OrePrefixes.stick.get(Materials.Titanium), + OrePrefixes.ingot.get(Materials.Titanium), + OrePrefixes.gearGt.get(Materials.Titanium), + OrePrefixes.gearGt.get(Materials.TungstenSteel)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 5, + 8192, + 1, + 1, + 1, + Materials.TungstenSteel, + OrePrefixes.frameGt.get(Materials.TungstenSteel), + OrePrefixes.stick.get(Materials.TungstenSteel), + OrePrefixes.ingot.get(Materials.TungstenSteel), + OrePrefixes.gearGt.get(Materials.TungstenSteel), + OrePrefixes.gearGt.get(Materials.Iridium)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 6, + 32768, + 1, + 1, + 1, + Materials.Iridium, + OrePrefixes.frameGt.get(Materials.Iridium), + OrePrefixes.stick.get(Materials.Iridium), + OrePrefixes.ingot.get(Materials.Iridium), + OrePrefixes.gearGt.get(Materials.Iridium), + OrePrefixes.gearGt.get(Materials.Neutronium)), + new Tier( + SubTag.ENERGY_ROTATIONAL, + 9, + Integer.MAX_VALUE - 7, + 1, + 1, + 1, + Materials.Neutronium, + OrePrefixes.frameGt.get(Materials.Neutronium), + OrePrefixes.stick.get(Materials.Neutronium), + OrePrefixes.ingot.get(Materials.Neutronium), + OrePrefixes.gearGt.get(Materials.Neutronium), + OrePrefixes.gearGt.get(Materials.Neutronium)), }, + STEAM = new Tier[] { new Tier( - SubTag.ENERGY_ROTATIONAL, - 1, - 32, - 1, - 1, - 1, - Materials.Wood, - OrePrefixes.frameGt.get(Materials.Wood), - OrePrefixes.stick.get(Materials.Wood), - OrePrefixes.ingot.get(Materials.Wood), - OrePrefixes.gearGt.get(Materials.Wood), - OrePrefixes.gearGt.get(Materials.Stone)), - new Tier( - SubTag.ENERGY_ROTATIONAL, - 1, - 32, - 1, - 2, - 2, - Materials.WoodSealed, - OrePrefixes.frameGt.get(Materials.WoodSealed), - OrePrefixes.stick.get(Materials.WoodSealed), - OrePrefixes.ingot.get(Materials.WoodSealed), - OrePrefixes.gearGt.get(Materials.WoodSealed), - OrePrefixes.gearGt.get(Materials.Stone)), - new Tier( - SubTag.ENERGY_ROTATIONAL, - 2, - 128, - 1, - 1, - 1, - Materials.Stone, - OrePrefixes.frameGt.get(Materials.Stone), - OrePrefixes.stick.get(Materials.Stone), - OrePrefixes.ingot.get(Materials.Stone), - OrePrefixes.gearGt.get(Materials.Stone), - OrePrefixes.gearGt.get(Materials.Bronze)), - new Tier( - SubTag.ENERGY_ROTATIONAL, - 2, - 128, - 1, - 2, - 2, - Materials.IronWood, - OrePrefixes.frameGt.get(Materials.IronWood), - OrePrefixes.stick.get(Materials.IronWood), - OrePrefixes.ingot.get(Materials.IronWood), - OrePrefixes.gearGt.get(Materials.IronWood), - OrePrefixes.gearGt.get(Materials.Bronze)), - new Tier( - SubTag.ENERGY_ROTATIONAL, - 3, - 512, - 1, - 1, - 1, - Materials.Bronze, - OrePrefixes.frameGt.get(Materials.Bronze), - OrePrefixes.stick.get(Materials.Bronze), - OrePrefixes.ingot.get(Materials.Bronze), - OrePrefixes.gearGt.get(Materials.Bronze), - OrePrefixes.gearGt.get(Materials.Steel)), - new Tier( - SubTag.ENERGY_ROTATIONAL, - 3, - 512, - 1, - 2, - 2, - Materials.Brass, - OrePrefixes.frameGt.get(Materials.Brass), - OrePrefixes.stick.get(Materials.Brass), - OrePrefixes.ingot.get(Materials.Brass), - OrePrefixes.gearGt.get(Materials.Brass), - OrePrefixes.gearGt.get(Materials.Steel)), + SubTag.ENERGY_STEAM, + 1, + 32, + 1, + 1, + 1, + Materials.Bronze, + OrePrefixes.frameGt.get(Materials.Bronze), + OrePrefixes.pipeMedium.get(Materials.Bronze), + OrePrefixes.pipeHuge.get(Materials.Bronze), + OrePrefixes.pipeMedium.get(Materials.Bronze), + OrePrefixes.pipeLarge.get(Materials.Bronze)), new Tier( - SubTag.ENERGY_ROTATIONAL, - 4, - 2048, - 1, - 1, - 1, - Materials.Steel, - OrePrefixes.frameGt.get(Materials.Steel), - OrePrefixes.stick.get(Materials.Steel), - OrePrefixes.ingot.get(Materials.Steel), - OrePrefixes.gearGt.get(Materials.Steel), - OrePrefixes.gearGt.get(Materials.TungstenSteel)), + SubTag.ENERGY_STEAM, + 2, + 128, + 1, + 1, + 1, + Materials.Steel, + OrePrefixes.frameGt.get(Materials.Steel), + OrePrefixes.pipeMedium.get(Materials.Steel), + OrePrefixes.pipeHuge.get(Materials.Steel), + OrePrefixes.pipeMedium.get(Materials.Steel), + OrePrefixes.pipeLarge.get(Materials.Steel)), new Tier( - SubTag.ENERGY_ROTATIONAL, - 4, - 2048, - 1, - 2, - 2, - Materials.Titanium, - OrePrefixes.frameGt.get(Materials.Titanium), - OrePrefixes.stick.get(Materials.Titanium), - OrePrefixes.ingot.get(Materials.Titanium), - OrePrefixes.gearGt.get(Materials.Titanium), - OrePrefixes.gearGt.get(Materials.TungstenSteel)), + SubTag.ENERGY_STEAM, + 3, + 512, + 1, + 1, + 1, + Materials.Titanium, + OrePrefixes.frameGt.get(Materials.Titanium), + OrePrefixes.pipeMedium.get(Materials.Titanium), + OrePrefixes.pipeHuge.get(Materials.Titanium), + OrePrefixes.pipeMedium.get(Materials.Titanium), + OrePrefixes.pipeLarge.get(Materials.Titanium)), new Tier( - SubTag.ENERGY_ROTATIONAL, - 5, - 8192, - 1, - 1, - 1, - Materials.TungstenSteel, - OrePrefixes.frameGt.get(Materials.TungstenSteel), - OrePrefixes.stick.get(Materials.TungstenSteel), - OrePrefixes.ingot.get(Materials.TungstenSteel), - OrePrefixes.gearGt.get(Materials.TungstenSteel), - OrePrefixes.gearGt.get(Materials.Iridium)), + SubTag.ENERGY_STEAM, + 4, + 2048, + 1, + 1, + 1, + Materials.TungstenSteel, + OrePrefixes.frameGt.get(Materials.TungstenSteel), + OrePrefixes.pipeMedium.get(Materials.TungstenSteel), + OrePrefixes.pipeHuge.get(Materials.TungstenSteel), + OrePrefixes.pipeMedium.get(Materials.TungstenSteel), + OrePrefixes.pipeLarge.get(Materials.TungstenSteel)), new Tier( - SubTag.ENERGY_ROTATIONAL, - 6, - 32768, - 1, - 1, - 1, - Materials.Iridium, - OrePrefixes.frameGt.get(Materials.Iridium), - OrePrefixes.stick.get(Materials.Iridium), - OrePrefixes.ingot.get(Materials.Iridium), - OrePrefixes.gearGt.get(Materials.Iridium), - OrePrefixes.gearGt.get(Materials.Neutronium)), + SubTag.ENERGY_STEAM, + 5, + 8192, + 1, + 1, + 1, + Materials.Iridium, + OrePrefixes.frameGt.get(Materials.Iridium), + OrePrefixes.pipeMedium.get(Materials.Iridium), + OrePrefixes.pipeHuge.get(Materials.Iridium), + OrePrefixes.pipeMedium.get(Materials.Iridium), + OrePrefixes.pipeLarge.get(Materials.Iridium)), new Tier( - SubTag.ENERGY_ROTATIONAL, - 9, - Integer.MAX_VALUE - 7, - 1, - 1, - 1, - Materials.Neutronium, - OrePrefixes.frameGt.get(Materials.Neutronium), - OrePrefixes.stick.get(Materials.Neutronium), - OrePrefixes.ingot.get(Materials.Neutronium), - OrePrefixes.gearGt.get(Materials.Neutronium), - OrePrefixes.gearGt.get(Materials.Neutronium)), }, - STEAM = new Tier[] { - new Tier( - SubTag.ENERGY_STEAM, - 1, - 32, - 1, - 1, - 1, - Materials.Bronze, - OrePrefixes.frameGt.get(Materials.Bronze), - OrePrefixes.pipeMedium.get(Materials.Bronze), - OrePrefixes.pipeHuge.get(Materials.Bronze), - OrePrefixes.pipeMedium.get(Materials.Bronze), - OrePrefixes.pipeLarge.get(Materials.Bronze)), - new Tier( - SubTag.ENERGY_STEAM, - 2, - 128, - 1, - 1, - 1, - Materials.Steel, - OrePrefixes.frameGt.get(Materials.Steel), - OrePrefixes.pipeMedium.get(Materials.Steel), - OrePrefixes.pipeHuge.get(Materials.Steel), - OrePrefixes.pipeMedium.get(Materials.Steel), - OrePrefixes.pipeLarge.get(Materials.Steel)), - new Tier( - SubTag.ENERGY_STEAM, - 3, - 512, - 1, - 1, - 1, - Materials.Titanium, - OrePrefixes.frameGt.get(Materials.Titanium), - OrePrefixes.pipeMedium.get(Materials.Titanium), - OrePrefixes.pipeHuge.get(Materials.Titanium), - OrePrefixes.pipeMedium.get(Materials.Titanium), - OrePrefixes.pipeLarge.get(Materials.Titanium)), - new Tier( - SubTag.ENERGY_STEAM, - 4, - 2048, - 1, - 1, - 1, - Materials.TungstenSteel, - OrePrefixes.frameGt.get(Materials.TungstenSteel), - OrePrefixes.pipeMedium.get(Materials.TungstenSteel), - OrePrefixes.pipeHuge.get(Materials.TungstenSteel), - OrePrefixes.pipeMedium.get(Materials.TungstenSteel), - OrePrefixes.pipeLarge.get(Materials.TungstenSteel)), - new Tier( - SubTag.ENERGY_STEAM, - 5, - 8192, - 1, - 1, - 1, - Materials.Iridium, - OrePrefixes.frameGt.get(Materials.Iridium), - OrePrefixes.pipeMedium.get(Materials.Iridium), - OrePrefixes.pipeHuge.get(Materials.Iridium), - OrePrefixes.pipeMedium.get(Materials.Iridium), - OrePrefixes.pipeLarge.get(Materials.Iridium)), - new Tier( - SubTag.ENERGY_STEAM, - 9, - Integer.MAX_VALUE - 7, - 1, - 1, - 1, - Materials.Neutronium, - OrePrefixes.frameGt.get(Materials.Neutronium), - OrePrefixes.pipeMedium.get(Materials.Neutronium), - OrePrefixes.pipeHuge.get(Materials.Neutronium), - OrePrefixes.pipeMedium.get(Materials.Neutronium), - OrePrefixes.pipeLarge.get(Materials.Neutronium)), }; + SubTag.ENERGY_STEAM, + 9, + Integer.MAX_VALUE - 7, + 1, + 1, + 1, + Materials.Neutronium, + OrePrefixes.frameGt.get(Materials.Neutronium), + OrePrefixes.pipeMedium.get(Materials.Neutronium), + OrePrefixes.pipeHuge.get(Materials.Neutronium), + OrePrefixes.pipeMedium.get(Materials.Neutronium), + OrePrefixes.pipeLarge.get(Materials.Neutronium)), }; /** * Used for Crafting Recipes */ @@ -453,8 +453,8 @@ public class Tier { private final Materials mMaterial; public Tier(SubTag aType, int aRank, long aPrimaryValue, long aSecondaryValue, long aSpeedMultiplier, - long aEnergyCostMultiplier, Materials aMaterial, Object aHullObject, Object aConductingObject, - Object aLargerConductingObject, Object aManagingObject, Object aBetterManagingObject) { + long aEnergyCostMultiplier, Materials aMaterial, Object aHullObject, Object aConductingObject, + Object aLargerConductingObject, Object aManagingObject, Object aBetterManagingObject) { mType = aType; mRank = (byte) aRank; mPrimaryValue = aPrimaryValue; diff --git a/src/main/java/gregtech/api/enums/ToolDictNames.java b/src/main/java/gregtech/api/enums/ToolDictNames.java index bc27fe6923..e4a8ee8444 100644 --- a/src/main/java/gregtech/api/enums/ToolDictNames.java +++ b/src/main/java/gregtech/api/enums/ToolDictNames.java @@ -35,7 +35,7 @@ public enum ToolDictNames { if (!aName.startsWith("craftingTool")) return false; for (ToolDictNames tool : ToolDictNames.values()) { if (tool.toString() - .equals(aName)) { + .equals(aName)) { return true; } } |