From 3e18e9fff0dc5d787f68411b296feec251382069 Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sun, 29 Jan 2023 11:07:19 -0800 Subject: [ci skip] spotlessApply with the new settings --- .../java/com/elisis/gtnhlanth/GTNHLanthanides.java | 16 +- .../com/elisis/gtnhlanth/client/ClientProxy.java | 3 +- .../common/register/BotWerkstoffMaterialPool.java | 109 +++-- .../gtnhlanth/common/register/LanthItemList.java | 7 +- .../common/register/WerkstoffMaterialPool.java | 263 +++++------ .../gtnhlanth/common/tileentity/Digester.java | 87 ++-- .../common/tileentity/DissolutionTank.java | 93 ++-- .../com/elisis/gtnhlanth/loader/BotRecipes.java | 225 ++++------ .../gtnhlanth/loader/MetaTileEntity_Loader.java | 3 +- .../com/elisis/gtnhlanth/loader/RecipeAdder.java | 137 +++--- .../com/elisis/gtnhlanth/loader/RecipeLoader.java | 494 +++++++++------------ .../elisis/gtnhlanth/loader/ZPMRubberChanges.java | 138 +++--- .../gtnhlanth/util/DescTextLocalization.java | 9 +- .../java/com/elisis/gtnhlanth/xmod/nei/IMC.java | 3 +- .../com/elisis/gtnhlanth/xmod/nei/NEI_Config.java | 1 + 15 files changed, 673 insertions(+), 915 deletions(-) (limited to 'src/main/java') diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index 9a597ae710..a22d58e0f9 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -1,5 +1,10 @@ package com.elisis.gtnhlanth; +import java.util.Arrays; +import java.util.logging.Logger; + +import net.minecraftforge.oredict.OreDictionary; + import com.elisis.gtnhlanth.common.CommonProxy; import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool; import com.elisis.gtnhlanth.common.register.LanthItemList; @@ -9,6 +14,7 @@ import com.elisis.gtnhlanth.loader.RecipeLoader; import com.elisis.gtnhlanth.xmod.nei.IMC; import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry; import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; + import cpw.mods.fml.common.Mod; import cpw.mods.fml.common.Mod.EventHandler; import cpw.mods.fml.common.SidedProxy; @@ -18,9 +24,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import gregtech.api.enums.OrePrefixes; import gregtech.api.util.GT_Log; -import java.util.Arrays; -import java.util.logging.Logger; -import net.minecraftforge.oredict.OreDictionary; @Mod( modid = Tags.MODID, @@ -73,9 +76,10 @@ public class GTNHLanthanides { GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray())); GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray())); - GT_Log.out.print("HMMM " - + Arrays.toString(OreDictionary.getOreIDs( - WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)))); + GT_Log.out.print( + "HMMM " + Arrays.toString( + OreDictionary.getOreIDs( + WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1)))); } @EventHandler diff --git a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java index db2f43e2c6..4420975173 100644 --- a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java +++ b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java @@ -2,4 +2,5 @@ package com.elisis.gtnhlanth.client; import com.elisis.gtnhlanth.common.CommonProxy; -public class ClientProxy extends CommonProxy {} +public class ClientProxy extends CommonProxy { +} diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java index 60d76c4cd8..77f33d2a61 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -5,23 +5,22 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; import static gregtech.api.enums.Materials.*; import static gregtech.api.enums.TextureSet.*; +import net.minecraft.util.EnumChatFormatting; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.util.Pair; -import net.minecraft.util.EnumChatFormatting; /* - * * Originally authored by botn365 under the MIT License. See BotdustriesLICENSE - * */ @SuppressWarnings("unchecked") public class BotWerkstoffMaterialPool implements Runnable { - private static final String DEPRECATED = - EnumChatFormatting.DARK_RED + "Deprecated; Will be removed in the next update"; + private static final String DEPRECATED = EnumChatFormatting.DARK_RED + + "Deprecated; Will be removed in the next update"; public static final Werkstoff TungsticAcid = new Werkstoff( - new short[] {0xf5, 0xf1, 0x16}, + new short[] { 0xf5, 0xf1, 0x16 }, "Tungstic Acid", new Werkstoff.Stats(), COMPOUND, @@ -32,7 +31,7 @@ public class BotWerkstoffMaterialPool implements Runnable { new Pair<>(Tungsten, 1), new Pair<>(Oxygen, 4)); public static final Werkstoff TungstenTrioxide = new Werkstoff( - new short[] {0x0f, 0x5, 0x16}, + new short[] { 0x0f, 0x5, 0x16 }, "Tungsten Trioxide", new Werkstoff.Stats(), COMPOUND, @@ -41,20 +40,20 @@ public class BotWerkstoffMaterialPool implements Runnable { SET_SHINY, new Pair<>(Tungsten, 1), new Pair<>(Oxygen, 3)); - // public static final Werkstoff TungstenSteelOxide = new Werkstoff( - // new short[]{0x1f,0x27,0x69}, - // "Tungstensteel Oxide", - // new Werkstoff.Stats(), - // COMPOUND, - // new Werkstoff.GenerationFeatures().onlyDust(), - // 29902, - // SET_FINE, - // new Pair<>(Tungsten, 1), - // new Pair<>(Oxygen,3), - // new Pair<>(Steel,1) - // ); + // public static final Werkstoff TungstenSteelOxide = new Werkstoff( + // new short[]{0x1f,0x27,0x69}, + // "Tungstensteel Oxide", + // new Werkstoff.Stats(), + // COMPOUND, + // new Werkstoff.GenerationFeatures().onlyDust(), + // 29902, + // SET_FINE, + // new Pair<>(Tungsten, 1), + // new Pair<>(Oxygen,3), + // new Pair<>(Steel,1) + // ); public static final Werkstoff AmmoniumNitrate = new Werkstoff( - new short[] {0x81, 0xcc, 0x00}, + new short[] { 0x81, 0xcc, 0x00 }, "Ammonium Nitrate", new Werkstoff.Stats(), COMPOUND, @@ -66,7 +65,7 @@ public class BotWerkstoffMaterialPool implements Runnable { new Pair<>(Nitrogen, 1), new Pair<>(Oxygen, 3)); public static final Werkstoff SodiumTungstate = new Werkstoff( - new short[] {0xc, 0xed, 0xd7, 0}, + new short[] { 0xc, 0xed, 0xd7, 0 }, "Sodium Tungstate", subscriptNumbers("Na2WO4"), new Werkstoff.Stats(), @@ -75,7 +74,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29904, SET_FINE); public static final Werkstoff Phosgene = new Werkstoff( - new short[] {0x15, 0xa1, 0x1a}, + new short[] { 0x15, 0xa1, 0x1a }, "Phosgene", subscriptNumbers("COCl2"), new Werkstoff.Stats(), @@ -84,7 +83,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29905, SET_FINE); public static final Werkstoff Ethylchloroformate = new Werkstoff( - new short[] {0x0a, 0xc2, 0xcc}, + new short[] { 0x0a, 0xc2, 0xcc }, "Ethyl Chloroformate", subscriptNumbers("C3H5ClO2"), new Werkstoff.Stats(), @@ -93,7 +92,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29906, SET_FINE); public static final Werkstoff Ethylcarbamate = new Werkstoff( - new short[] {0x0d, 0xa9, 0xb8}, + new short[] { 0x0d, 0xa9, 0xb8 }, "Ethyl Carbamate", subscriptNumbers("CH3CH2O2CNH2"), new Werkstoff.Stats(), @@ -102,7 +101,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29907, SET_FINE); public static final Werkstoff EthylNnitrocarbamate = new Werkstoff( - new short[] {0x0d, 0x85, 0xb8}, + new short[] { 0x0d, 0x85, 0xb8 }, "Ethyl N-nitrocarbamate", subscriptNumbers("C3H6N2O4"), new Werkstoff.Stats(), @@ -111,7 +110,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29908, SET_FINE); public static final Werkstoff AmmoniumNnitrourethane = new Werkstoff( - new short[] {0x0d, 0x54, 0xb8}, + new short[] { 0x0d, 0x54, 0xb8 }, "Ammonium N-nitrourethane", subscriptNumbers("C3H9N3O4"), new Werkstoff.Stats(), @@ -120,7 +119,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29909, SET_FINE); public static final Werkstoff EthylDinitrocarbamate = new Werkstoff( - new short[] {0x39, 0x08, 0xc2}, + new short[] { 0x39, 0x08, 0xc2 }, "Ethyl Dinitrocarbamate", subscriptNumbers("C3H5N3O6"), new Werkstoff.Stats(), @@ -129,7 +128,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29910, SET_FINE); public static final Werkstoff DinitrogenPentoxide = new Werkstoff( - new short[] {0xcf, 0xeb, 0x34}, + new short[] { 0xcf, 0xeb, 0x34 }, "Dinitrogen Pentoxide", subscriptNumbers("N2O5"), new Werkstoff.Stats(), @@ -138,7 +137,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29911, SET_FINE); public static final Werkstoff AmmoniumDinitramide = new Werkstoff( - new short[] {0x8a, 0x0f, 0xd1}, + new short[] { 0x8a, 0x0f, 0xd1 }, "Ammonium Dinitramide", subscriptNumbers("H4N4O4"), new Werkstoff.Stats(), @@ -147,7 +146,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29912, SET_FINE); public static final Werkstoff LMP103S = new Werkstoff( - new short[] {0xbf, 0x2f, 0xc2}, + new short[] { 0xbf, 0x2f, 0xc2 }, "LMP-103S", DEPRECATED, new Werkstoff.Stats(), @@ -156,7 +155,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29913, SET_FINE); public static final Werkstoff OXylene = new Werkstoff( - new short[] {0x88, 0x94, 0xa8}, + new short[] { 0x88, 0x94, 0xa8 }, "O-Xylene", subscriptNumbers("C8H10"), new Werkstoff.Stats().setGas(true), @@ -165,7 +164,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29915, SET_FINE); public static final Werkstoff PhthalicAnhydride = new Werkstoff( - new short[] {0x7c, 0x99, 0x42}, + new short[] { 0x7c, 0x99, 0x42 }, "Phthalic Anhydride", subscriptNumbers("C8H4O3"), new Werkstoff.Stats(), @@ -174,7 +173,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29916, SET_METALLIC); public static final Werkstoff VanadiumPentoxide = new Werkstoff( - new short[] {0x69, 0x69, 0x69}, + new short[] { 0x69, 0x69, 0x69 }, "Vanadium Pentoxide", subscriptNumbers("V2O5"), new Werkstoff.Stats(), @@ -183,7 +182,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29917, SET_METALLIC); public static final Werkstoff TertButylbenzene = new Werkstoff( - new short[] {0, 0, 0}, + new short[] { 0, 0, 0 }, "Tert-Butylbenzene", subscriptNumbers("C10H14"), new Werkstoff.Stats(), @@ -192,7 +191,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29918, SET_METALLIC); public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff( - new short[] {0xcc, 0x86, 0x5a}, + new short[] { 0xcc, 0x86, 0x5a }, "2-tert-butyl-anthraquinone", subscriptNumbers("C18H16O2"), new Werkstoff.Stats(), @@ -201,7 +200,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29919, SET_METALLIC); public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff( - new short[] {0xad, 0x53, 0x1a}, + new short[] { 0xad, 0x53, 0x1a }, "2-tert-butyl-anthrahydroquinone", subscriptNumbers("C18H17O2"), new Werkstoff.Stats(), @@ -210,7 +209,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29920, SET_METALLIC); public static final Werkstoff HydrogenPeroxide = new Werkstoff( - new short[] {0xad, 0x53, 0x1a}, + new short[] { 0xad, 0x53, 0x1a }, "Hydrogen Peroxide", subscriptNumbers("H2O2"), new Werkstoff.Stats(), @@ -219,7 +218,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29921, SET_METALLIC); public static final Werkstoff Hydrazine = new Werkstoff( - new short[] {0xb5, 0x07, 0x07}, + new short[] { 0xb5, 0x07, 0x07 }, "hydrazine", subscriptNumbers("N2H4"), new Werkstoff.Stats(), @@ -228,7 +227,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29922, SET_METALLIC); public static final Werkstoff DimethylSulfate = new Werkstoff( - new short[] {0xff, 0xfb, 0x00}, + new short[] { 0xff, 0xfb, 0x00 }, "Dimethyl Sulfate", subscriptNumbers("(CH3O)2SO2"), new Werkstoff.Stats(), @@ -237,7 +236,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29923, SET_METALLIC); public static final Werkstoff Monomethylhydrazine = new Werkstoff( - new short[] {0xff, 0x61, 0x00}, + new short[] { 0xff, 0x61, 0x00 }, "Monomethylhydrazine", subscriptNumbers("CH6N2"), new Werkstoff.Stats(), @@ -246,7 +245,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29924, SET_METALLIC); public static final Werkstoff Formaldehyde = new Werkstoff( - new short[] {0x2e, 0xd9, 0x83}, + new short[] { 0x2e, 0xd9, 0x83 }, "Formaldehyde", subscriptNumbers("CH2O"), new Werkstoff.Stats(), @@ -255,7 +254,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29925, SET_METALLIC); public static final Werkstoff EthylAcetate = new Werkstoff( - new short[] {0x0c, 0xfb, 0x32b}, + new short[] { 0x0c, 0xfb, 0x32b }, "Ethyl Acetate", subscriptNumbers("C4H8O2"), new Werkstoff.Stats(), @@ -264,7 +263,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29926, SET_METALLIC); public static final Werkstoff Acetylhydrazine = new Werkstoff( - new short[] {0xd1, 0x5c, 0x5c}, + new short[] { 0xd1, 0x5c, 0x5c }, "Acetylhydrazine", subscriptNumbers("C2H6N2O"), new Werkstoff.Stats(), @@ -273,7 +272,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29927, SET_METALLIC); public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff( - new short[] {0x80, 0x06, 0x00}, + new short[] { 0x80, 0x06, 0x00 }, "Unsymmetrical Dimethylhydrazine", subscriptNumbers("H2NN(CH3)2"), new Werkstoff.Stats(), @@ -282,7 +281,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29928, SET_METALLIC); public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff( - new short[] {0x78, 0xe3, 0xa7}, + new short[] { 0x78, 0xe3, 0xa7 }, "Monomethylhydrazine Fuel Mix", DEPRECATED, new Werkstoff.Stats(), @@ -291,7 +290,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29929, SET_METALLIC); public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff( - new short[] {0xc8, 0xff, 0x00}, + new short[] { 0xc8, 0xff, 0x00 }, "Unsymmetrical Dimethylhydrazine Fuel Mix", DEPRECATED, new Werkstoff.Stats(), @@ -300,7 +299,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29930, SET_METALLIC); public static final Werkstoff Nitromethane = new Werkstoff( - new short[] {0x87, 0x7d, 0x60}, + new short[] { 0x87, 0x7d, 0x60 }, "Nitromethane", subscriptNumbers("CH3NO2"), new Werkstoff.Stats(), @@ -309,7 +308,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29914, SET_METALLIC); public static final Werkstoff BoronTrioxide = new Werkstoff( - new short[] {0xe3, 0xa6, 0xd3}, + new short[] { 0xe3, 0xa6, 0xd3 }, "Boron Trioxide", subscriptNumbers("B2O3"), new Werkstoff.Stats(), @@ -318,7 +317,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29931, SET_METALLIC); public static final Werkstoff BoronTrifluoride = new Werkstoff( - new short[] {0xd0, 0xe0, 0x3f}, + new short[] { 0xd0, 0xe0, 0x3f }, "Boron Trifluoride", subscriptNumbers("BF3"), new Werkstoff.Stats().setGas(true), @@ -327,7 +326,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29932, SET_METALLIC); public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff( - new short[] {0x57, 0x69, 0x2d}, + new short[] { 0x57, 0x69, 0x2d }, "Nitronium Tetrafluoroborate", subscriptNumbers("NO2BF4"), new Werkstoff.Stats(), @@ -336,7 +335,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29933, SET_METALLIC); public static final Werkstoff Trinitramid = new Werkstoff( - new short[] {0x28, 0x2b, 0x70}, + new short[] { 0x28, 0x2b, 0x70 }, "Trinitramid", subscriptNumbers("N4O6"), new Werkstoff.Stats().setGas(true), @@ -345,7 +344,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29934, SET_METALLIC); public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff( - new short[] {0x28, 0x2b, 0x70}, + new short[] { 0x28, 0x2b, 0x70 }, "Ammonia Boronfluoride Solution", subscriptNumbers("NH4BF4"), new Werkstoff.Stats(), @@ -354,7 +353,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29935, SET_METALLIC); public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff( - new short[] {0xbe, 0x6e, 0xe0}, + new short[] { 0xbe, 0x6e, 0xe0 }, "Sodium Tetrafluoroborate", subscriptNumbers("NaBF4"), new Werkstoff.Stats(), @@ -363,7 +362,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29936, SET_METALLIC); public static final Werkstoff SodiumFluoride = new Werkstoff( - new short[] {0x9f, 0x70, 0xe6}, + new short[] { 0x9f, 0x70, 0xe6 }, "Sodium Fluoride", subscriptNumbers("NaF"), new Werkstoff.Stats(), @@ -372,7 +371,7 @@ public class BotWerkstoffMaterialPool implements Runnable { 29937, SET_METALLIC); public static final Werkstoff Tetrafluoroborate = new Werkstoff( - new short[] {0x6a, 0x53, 0x8c}, + new short[] { 0x6a, 0x53, 0x8c }, "Tetrafluoroboric Acid", subscriptNumbers("HBF4"), new Werkstoff.Stats().setGas(true), diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java index abed46df99..a3668b5aeb 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java @@ -1,8 +1,9 @@ package com.elisis.gtnhlanth.common.register; +import net.minecraft.item.ItemStack; + import com.elisis.gtnhlanth.common.tileentity.Digester; import com.elisis.gtnhlanth.common.tileentity.DissolutionTank; -import net.minecraft.item.ItemStack; public final class LanthItemList { @@ -12,7 +13,7 @@ public final class LanthItemList { public static void register() { LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L); - LanthItemList.DISSOLUTION_TANK = - new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L); + LanthItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank") + .getStackForm(1L); } } diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java index d26cb932f5..a3f6e488b9 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -2,13 +2,15 @@ package com.elisis.gtnhlanth.common.register; import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; +import java.util.Arrays; + import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; import com.github.bartimaeusnek.bartworks.util.Pair; + import gregtech.api.enums.Materials; import gregtech.api.enums.TextureSet; -import java.util.Arrays; -@SuppressWarnings({"unchecked"}) +@SuppressWarnings({ "unchecked" }) public class WerkstoffMaterialPool implements Runnable { private static final int offsetID = 11_000; @@ -16,58 +18,50 @@ public class WerkstoffMaterialPool implements Runnable { private static final int offsetID3 = 11_300; /* - * public static final Werkstoff __ = new Werkstoff( - new short[] {_, _, _}, - "__", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable(), - offsetID_, - TextureSet.SET_DULL - ); - */ + * public static final Werkstoff __ = new Werkstoff( new short[] {_, _, _}, "__", new Werkstoff.Stats(), + * Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable(), offsetID_, TextureSet.SET_DULL ); + */ // Misc. public static final Werkstoff Hafnium = new Werkstoff( - new short[] {232, 224, 219}, + new short[] { 232, 224, 219 }, "Hafnium", subscriptNumbers("Hf"), new Werkstoff.Stats(), Werkstoff.Types.ELEMENT, - new Werkstoff.GenerationFeatures() - .disable() - .onlyDust() - .addMetalItems() - .enforceUnification(), // Perhaps use hafnia liquid in elemental hafnium synthesis + new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), // Perhaps use + // hafnia + // liquid in + // elemental + // hafnium + // synthesis offsetID, TextureSet.SET_DULL); public static final Werkstoff LowPurityHafnium = new Werkstoff( - new short[] {240, 223, 208}, + new short[] { 240, 223, 208 }, "Low-Purity Hafnium", subscriptNumbers("??Hf??"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures() - .disable() - .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis + new Werkstoff.GenerationFeatures().disable().onlyDust(), // Perhaps use hafnia liquid in elemental hafnium + // synthesis offsetID + 1, TextureSet.SET_DULL); public static final Werkstoff Hafnia = new Werkstoff( - new short[] {247, 223, 203}, + new short[] { 247, 223, 203 }, "Hafnia", subscriptNumbers("HfO2"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures() - .disable() - .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis + new Werkstoff.GenerationFeatures().disable().onlyDust(), // Perhaps use hafnia liquid in elemental hafnium + // synthesis offsetID + 2, TextureSet.SET_DULL); public static final Werkstoff HafniumTetrachloride = new Werkstoff( - new short[] {238, 247, 249}, + new short[] { 238, 247, 249 }, "Hafnium Tetrachloride", subscriptNumbers("HfCl4"), new Werkstoff.Stats(), @@ -77,7 +71,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff( - new short[] {238, 247, 249}, + new short[] { 238, 247, 249 }, "Hafnium Tetrachloride Solution", subscriptNumbers("HfCl4"), new Werkstoff.Stats(), @@ -87,7 +81,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff HafniumIodide = new Werkstoff( - new short[] {216, 60, 1}, + new short[] { 216, 60, 1 }, "Hafnium Iodide", subscriptNumbers("HfI4"), new Werkstoff.Stats(), @@ -97,7 +91,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff HafniumRunoff = new Werkstoff( - new short[] {74, 65, 42}, // Literally the statistically ugliest colour + new short[] { 74, 65, 42 }, // Literally the statistically ugliest colour "Hafnium Runoff", subscriptNumbers("??????"), new Werkstoff.Stats(), @@ -107,21 +101,17 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff Zirconium = new Werkstoff( - new short[] {225, 230, 225}, + new short[] { 225, 230, 225 }, "Zirconium", subscriptNumbers("Zr"), new Werkstoff.Stats().setBlastFurnace(true), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures() - .disable() - .onlyDust() - .addMetalItems() - .enforceUnification(), + new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), offsetID + 7, TextureSet.SET_DULL); public static final Werkstoff Zirconia = new Werkstoff( - new short[] {177, 152, 101}, + new short[] { 177, 152, 101 }, "Zirconia", subscriptNumbers("ZrO2"), new Werkstoff.Stats(), @@ -131,7 +121,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff ZirconiumTetrachloride = new Werkstoff( - new short[] {179, 164, 151}, + new short[] { 179, 164, 151 }, "Zirconium Tetrachloride", subscriptNumbers("ZrCl4"), new Werkstoff.Stats(), @@ -141,20 +131,19 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff( - new short[] {179, 164, 151}, + new short[] { 179, 164, 151 }, "Zirconium Tetrachloride Solution", subscriptNumbers("ZrCl4"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures() - .disable() - .addCells(), // Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty + new Werkstoff.GenerationFeatures().disable().addCells(), // Blast Furnace needs liquid input because it + // can't do 3 item inputs so have a shitty // material offsetID + 10, TextureSet.SET_FLUID); public static final Werkstoff HafniaZirconiaBlend = new Werkstoff( - new short[] {247, 223, 203}, + new short[] { 247, 223, 203 }, "Hafnia-Zirconia Blend", // Maybe Hafnon?? subscriptNumbers("??HfZr??"), new Werkstoff.Stats(), @@ -164,15 +153,10 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff Iodine = new Werkstoff( - new short[] {171, 40, 175}, + new short[] { 171, 40, 175 }, "Iodine", subscriptNumbers("I"), - new Werkstoff.Stats() - .setProtons(53) - .setMass(127) - .setSublimation(true) - .setBoilingPoint(484) - .setGas(true), + new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true), Werkstoff.Types.ELEMENT, new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(), offsetID + 12, @@ -180,7 +164,7 @@ public class WerkstoffMaterialPool implements Runnable { // Lanthanide Line public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff( - new short[] {111, 78, 55}, + new short[] { 111, 78, 55 }, "Muddy Monazite Rare Earth Solution", subscriptNumbers("??LaNdZr??"), new Werkstoff.Stats(), @@ -190,7 +174,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff( - new short[] {160, 120, 90}, + new short[] { 160, 120, 90 }, "Diluted Monazite Rare Earth Mud", subscriptNumbers("??LaNdHf??"), new Werkstoff.Stats(), @@ -200,7 +184,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff( - new short[] {237, 201, 175}, + new short[] { 237, 201, 175 }, "Diluted Monazite Sulfate", subscriptNumbers("??LaNd??"), new Werkstoff.Stats(), @@ -210,7 +194,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff( - new short[] {250, 223, 173}, + new short[] { 250, 223, 173 }, "Nitrogenated Monazite Rare Earth Concentrate", subscriptNumbers("??LaNd??"), new Werkstoff.Stats(), @@ -220,7 +204,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff( - new short[] {244, 202, 22}, + new short[] { 244, 202, 22 }, "Nitric Monazite Leached Concentrate", subscriptNumbers("??LaNd??"), new Werkstoff.Stats(), @@ -230,7 +214,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff MonaziteSulfate = new Werkstoff( - new short[] {152, 118, 84}, + new short[] { 152, 118, 84 }, "Monazite Sulfate", subscriptNumbers("??CeEu??"), new Werkstoff.Stats(), @@ -240,7 +224,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff AcidicMonazitePowder = new Werkstoff( - new short[] {50, 23, 77}, + new short[] { 50, 23, 77 }, "Acidic Monazite Powder", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -250,7 +234,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff( - new short[] {72, 60, 50}, + new short[] { 72, 60, 50 }, "Monazite Rare Earth Filtrate", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -260,7 +244,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff NeutralizedMonaziteRareEarthFiltrate = new Werkstoff( - new short[] {50, 23, 77}, + new short[] { 50, 23, 77 }, "Neutralized Monazite Rare Earth Filtrate", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -270,7 +254,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MonaziteRareEarthHydroxideConcentrate = new Werkstoff( - new short[] {193, 154, 107}, + new short[] { 193, 154, 107 }, "Monazite Rare Earth Hydroxide Concentrate", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -280,7 +264,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff DriedMonaziteRareEarthConcentrate = new Werkstoff( - new short[] {250, 214, 165}, + new short[] { 250, 214, 165 }, "Dried Monazite Rare Earth Concentrate", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -290,7 +274,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CeriumDioxide = new Werkstoff( - new short[] {255, 255, 255}, + new short[] { 255, 255, 255 }, "Cerium Dioxide", subscriptNumbers("CeO2"), new Werkstoff.Stats(), @@ -300,7 +284,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CeriumChloride = new Werkstoff( - new short[] {255, 255, 255}, + new short[] { 255, 255, 255 }, "Cerium Chloride", subscriptNumbers("CeCl3"), new Werkstoff.Stats(), @@ -310,7 +294,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CeriumOxalate = new Werkstoff( - new short[] {255, 255, 224}, + new short[] { 255, 255, 224 }, "Cerium Oxalate", subscriptNumbers("Ce2(C2O4)3"), new Werkstoff.Stats(), @@ -320,7 +304,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CeriumIIIOxide = new Werkstoff( - new short[] {255, 255, 102}, + new short[] { 255, 255, 102 }, "Cerium (III) Oxide", subscriptNumbers("Ce2O3"), new Werkstoff.Stats().setElektrolysis(true), @@ -333,7 +317,7 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff CeriumRichMixture = new Werkstoff( - new short[] {244, 164, 96}, + new short[] { 244, 164, 96 }, "Cerium-Rich Mixture", subscriptNumbers("??Ce??"), new Werkstoff.Stats(), @@ -343,7 +327,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CooledMonaziteRareEarthConcentrate = new Werkstoff( - new short[] {250, 214, 165}, + new short[] { 250, 214, 165 }, "Cooled Monazite Rare Earth Concentrate", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -353,7 +337,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MonaziteRarerEarthSediment = new Werkstoff( - new short[] {250, 214, 165}, + new short[] { 250, 214, 165 }, "MonaziteRarer Earth Sediment", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -363,7 +347,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MonaziteHeterogenousHalogenicRareEarthMixture = new Werkstoff( - new short[] {250, 214, 165}, + new short[] { 250, 214, 165 }, "Heterogenous Halogenic Monazite Rare Earth Mixture", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -373,7 +357,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff SaturatedMonaziteRareEarthMixture = new Werkstoff( - new short[] {250, 214, 165}, + new short[] { 250, 214, 165 }, "Saturated Monazite Rare Earth", subscriptNumbers("????"), new Werkstoff.Stats(), @@ -383,7 +367,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff SamaricResidue = new Werkstoff( - new short[] {248, 243, 231}, + new short[] { 248, 243, 231 }, "Samaric Residue", subscriptNumbers("??SmGd??"), new Werkstoff.Stats(), @@ -393,7 +377,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MonaziteResidue = new Werkstoff( - new short[] {64, 69, 62}, + new short[] { 64, 69, 62 }, "Monazite Residue", subscriptNumbers("??ZrHfTh??"), new Werkstoff.Stats(), @@ -403,7 +387,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff AmmoniumNitrate = new Werkstoff( - new short[] {255, 255, 255}, + new short[] { 255, 255, 255 }, "Ammonium Nitrate Solution", subscriptNumbers("NH4NO3"), new Werkstoff.Stats(), @@ -413,7 +397,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ThoriumPhosphateCake = new Werkstoff( - new short[] {188, 143, 143}, + new short[] { 188, 143, 143 }, "Thorium-Phosphate Cake", subscriptNumbers("??ThP??"), new Werkstoff.Stats(), @@ -423,7 +407,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff ThoriumPhosphateConcentrate = new Werkstoff( - new short[] {217, 144, 88}, + new short[] { 217, 144, 88 }, "Thorium-Phosphate Concentrate", subscriptNumbers("??ThP??"), new Werkstoff.Stats(), @@ -433,7 +417,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff UraniumFiltrate = new Werkstoff( - new short[] {190, 240, 94}, + new short[] { 190, 240, 94 }, "UraniumFiltrate", subscriptNumbers("??U??"), new Werkstoff.Stats(), @@ -443,7 +427,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff NeutralizedUraniumFiltrate = new Werkstoff( - new short[] {217, 120, 88}, + new short[] { 217, 120, 88 }, "Neutralized Uranium Filtrate", subscriptNumbers("??U??"), new Werkstoff.Stats(), @@ -453,7 +437,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff SeaweedAsh = new Werkstoff( - new short[] {70, 75, 71}, + new short[] { 70, 75, 71 }, "Seaweed Ash", new Werkstoff.Stats(), Werkstoff.Types.BIOLOGICAL, @@ -462,7 +446,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff SeaweedConcentrate = new Werkstoff( - new short[] {70, 100, 71}, + new short[] { 70, 100, 71 }, "Seaweed Concentrate", subscriptNumbers("??I??"), new Werkstoff.Stats(), @@ -472,7 +456,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff PotassiumPermanganate = new Werkstoff( - new short[] {165, 50, 138}, + new short[] { 165, 50, 138 }, "Potassium Permanganate", subscriptNumbers("KMnO4"), new Werkstoff.Stats(), @@ -482,7 +466,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff PotassiumPermanganateSolution = new Werkstoff( - new short[] {165, 50, 138}, + new short[] { 165, 50, 138 }, "Potassium Permanganate Solution", subscriptNumbers("KMnO4"), new Werkstoff.Stats(), @@ -492,7 +476,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff SeaweedByproducts = new Werkstoff( - new short[] {125, 50, 138}, + new short[] { 125, 50, 138 }, "Seaweed Byproducts", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -501,7 +485,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff NitricLeachedMonaziteMixture = new Werkstoff( - new short[] {125, 50, 138}, + new short[] { 125, 50, 138 }, "Nitric-Leached Monazite Mixture", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -510,7 +494,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff EuropiumOxide = new Werkstoff( - new short[] {255, 255, 255}, + new short[] { 255, 255, 255 }, "Europium Oxide", subscriptNumbers("EuO"), new Werkstoff.Stats(), @@ -520,7 +504,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff EuropiumSulfide = new Werkstoff( - new short[] {5, 0, 5}, + new short[] { 5, 0, 5 }, "Europium Sulfide", subscriptNumbers("EuS"), new Werkstoff.Stats(), @@ -530,7 +514,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff UnknownBlend = new Werkstoff( - new short[] {0, 0, 5}, + new short[] { 0, 0, 5 }, "UnknownBlend", subscriptNumbers("?????"), new Werkstoff.Stats(), @@ -543,7 +527,7 @@ public class WerkstoffMaterialPool implements Runnable { // BASTNASITE public static final Werkstoff MuddyRareEarthBastnasiteSolution = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Muddy Bastnasite Rare Earth Solution", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -552,19 +536,12 @@ public class WerkstoffMaterialPool implements Runnable { offsetID2, TextureSet.SET_FLUID); /* - public static final Werkstoff FluorosilicicAcid = new Werkstoff( - new short[] {205, 133, 63}, - "Hexafluorosilicic Acid", - subscriptNumbers("H2SiF6"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 1, - TextureSet.SET_FLUID - ); - */ + * public static final Werkstoff FluorosilicicAcid = new Werkstoff( new short[] {205, 133, 63}, + * "Hexafluorosilicic Acid", subscriptNumbers("H2SiF6"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new + * Werkstoff.GenerationFeatures().disable().addCells(), offsetID2 + 1, TextureSet.SET_FLUID ); + */ public static final Werkstoff SodiumFluorosilicate = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Sodiumfluorosilicate", subscriptNumbers("Na2SiF6"), new Werkstoff.Stats(), @@ -574,7 +551,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff SteamCrackedBasnasiteSolution = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Steam-Cracked Bastnasite Mud", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -584,7 +561,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff ConditionedBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Conditioned Bastnasite Mud", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -594,7 +571,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff DiltedRareEarthBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Diluted Bastnasite Mud", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -604,7 +581,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff FilteredBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Filtered Bastnasite Mud", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -614,7 +591,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff BastnasiteRareEarthOxidePowder = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Bastnasite Rare Earth Oxides", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -624,7 +601,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff LeachedBastnasiteRareEarthOxides = new Werkstoff( - new short[] {205, 133, 63}, + new short[] { 205, 133, 63 }, "Acid-Leached Bastnasite Rare Earth Oxides", subscriptNumbers("??LaCeY??"), new Werkstoff.Stats(), @@ -634,7 +611,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff Gangue = new Werkstoff( - new short[] {0, 0, 0}, + new short[] { 0, 0, 0 }, "Gangue", subscriptNumbers("Useless..."), new Werkstoff.Stats(), @@ -644,7 +621,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); // TODO: Deal with colouring public static final Werkstoff RoastedRareEarthOxides = new Werkstoff( - new short[] {160, 82, 45}, + new short[] { 160, 82, 45 }, "Roasted Rare Earth Oxides", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -653,7 +630,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff WetRareEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, + new short[] { 160, 82, 49 }, "Wet Rare Earth Oxides", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -662,7 +639,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CeriumOxidisedRareEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, + new short[] { 160, 82, 49 }, "Cerium-Oxidised Rare Earth Oxides", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -671,7 +648,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, + new short[] { 160, 82, 49 }, "Bastnasite Rarer Earth Oxides", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -680,7 +657,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff( - new short[] {160, 90, 60}, + new short[] { 160, 90, 60 }, "Nitrogenated Bastnasite Rarer Earth Oxides", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -689,7 +666,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff( - new short[] {170, 90, 60}, + new short[] { 170, 90, 60 }, "Bastnasite Rarer Earth Oxide Suspension", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -698,7 +675,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff( - new short[] {170, 90, 60}, + new short[] { 170, 90, 60 }, "Samaric Rare Earth Concentrate", subscriptNumbers("??SmHoTb??"), new Werkstoff.Stats(), @@ -708,7 +685,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff( - new short[] {170, 90, 60}, + new short[] { 170, 90, 60 }, "Neodymium Rare Earth Concentrate", subscriptNumbers("??LaNdPr??"), new Werkstoff.Stats(), @@ -718,7 +695,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff( - new short[] {170, 90, 60}, + new short[] { 170, 90, 60 }, "Fluorinated Neodymium Rare Earths", subscriptNumbers("??LaNdPr??"), new Werkstoff.Stats(), @@ -728,7 +705,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff( - new short[] {82, 112, 102}, + new short[] { 82, 112, 102 }, "Praseodymium Tetrafluoride", subscriptNumbers("PrF4"), new Werkstoff.Stats().setElektrolysis(true), @@ -741,7 +718,7 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Fluorine, 4)); public static final Werkstoff RareEarthTrifluorides = new Werkstoff( - new short[] {82, 112, 102}, + new short[] { 82, 112, 102 }, "Rare Earth Trifluorides", subscriptNumbers("??LaNd??"), new Werkstoff.Stats(), @@ -751,7 +728,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff LanthaniumChloride = new Werkstoff( - new short[] {82, 112, 102}, + new short[] { 82, 112, 102 }, "Lanthanium Chloride", subscriptNumbers("LaCl3"), new Werkstoff.Stats().setElektrolysis(true), @@ -764,7 +741,7 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Chlorine, 3)); public static final Werkstoff NeodymiumOxide = new Werkstoff( - new short[] {82, 112, 102}, + new short[] { 82, 112, 102 }, "Neodymium Oxide", subscriptNumbers("Nd2O3"), new Werkstoff.Stats().setElektrolysis(true), @@ -777,7 +754,7 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff( - new short[] {255, 182, 193}, + new short[] { 255, 182, 193 }, "Fluorinated Samaric Concentrate", subscriptNumbers("??SmHo??"), new Werkstoff.Stats(), @@ -787,7 +764,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff CalciumFluoride = new Werkstoff( - new short[] {255, 250, 250}, + new short[] { 255, 250, 250 }, "Calcium Fluoride", subscriptNumbers("CaF2"), new Werkstoff.Stats().setElektrolysis(true), @@ -800,7 +777,7 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Fluorine, 2)); public static final Werkstoff SamariumTerbiumMixture = new Werkstoff( - new short[] {223, 182, 193}, + new short[] { 223, 182, 193 }, "Samarium-Terbium Mixture", subscriptNumbers("??SmTb??"), new Werkstoff.Stats(), @@ -810,7 +787,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff( - new short[] {223, 182, 193}, + new short[] { 223, 182, 193 }, "Nitrogenated Samarium-Terbium Mixture", subscriptNumbers("??SmTb??NH4NO3"), new Werkstoff.Stats(), @@ -820,7 +797,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff TerbiumNitrate = new Werkstoff( - new short[] {167, 252, 0}, + new short[] { 167, 252, 0 }, "Terbium Nitrate", subscriptNumbers("TbNO3"), new Werkstoff.Stats().setElektrolysis(true), @@ -834,7 +811,7 @@ public class WerkstoffMaterialPool implements Runnable { new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff SamariumOreConcentrate = new Werkstoff( - new short[] {255, 200, 230}, + new short[] { 255, 200, 230 }, "Samarium Ore Concentrate", subscriptNumbers("??Sm??"), new Werkstoff.Stats(), @@ -844,7 +821,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff( - new short[] {255, 170, 220}, + new short[] { 255, 170, 220 }, "Dephosphated Samarium Concentrate", subscriptNumbers("??Sm??"), new Werkstoff.Stats(), @@ -855,7 +832,7 @@ public class WerkstoffMaterialPool implements Runnable { // Weird/Exciting Chemicals public static final Werkstoff Tetrahydrofuran = new Werkstoff( - new short[] {222, 165, 164}, + new short[] { 222, 165, 164 }, "Tetrahydrofuran", subscriptNumbers("(CH2)4O"), new Werkstoff.Stats(), @@ -866,7 +843,7 @@ public class WerkstoffMaterialPool implements Runnable { // 1,4-Butanediol public static final Werkstoff Butanediol = new Werkstoff( - new short[] {185, 78, 72}, + new short[] { 185, 78, 72 }, "1,4-Butanediol", subscriptNumbers("HO(CH2)4OH"), new Werkstoff.Stats(), @@ -877,7 +854,7 @@ public class WerkstoffMaterialPool implements Runnable { // Acidicised 1,4-Butanediol public static final Werkstoff AcidicButanediol = new Werkstoff( - new short[] {255, 239, 213}, + new short[] { 255, 239, 213 }, "Acidicised 1,4-Butanediol", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -887,7 +864,7 @@ public class WerkstoffMaterialPool implements Runnable { // Tellurium-Molybdenum-Oxide Catalyst public static final Werkstoff MoTeOCatalyst = new Werkstoff( - new short[] {238, 131, 238}, + new short[] { 238, 131, 238 }, "Tellurium-Molybdenum-Oxide Catalyst", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, @@ -897,7 +874,7 @@ public class WerkstoffMaterialPool implements Runnable { // Tellurium Oxide public static final Werkstoff TelluriumIVOxide = new Werkstoff( - new short[] {229, 199, 187}, + new short[] { 229, 199, 187 }, "Tellurium (IV) Oxide", subscriptNumbers("TeO2"), new Werkstoff.Stats(), @@ -907,7 +884,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MolybdenumIVOxide = new Werkstoff( - new short[] {52, 53, 57}, + new short[] { 52, 53, 57 }, "Molybdenum (IV) Oxide", subscriptNumbers("MoO2"), new Werkstoff.Stats(), @@ -917,7 +894,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff Polytetrahydrofuran = new Werkstoff( - new short[] {192, 128, 129}, + new short[] { 192, 128, 129 }, "Polytetrahydrofuran", subscriptNumbers("(C4H8O)OH2"), new Werkstoff.Stats(), @@ -927,7 +904,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff TungstophosphoricAcid = new Werkstoff( - new short[] {223, 255, 0}, + new short[] { 223, 255, 0 }, "Tungstophosphoric Acid", subscriptNumbers("H3PW12O40"), new Werkstoff.Stats(), @@ -937,7 +914,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff TolueneDiisocyanate = new Werkstoff( - new short[] {255, 255, 102}, + new short[] { 255, 255, 102 }, "Toluene Diisocyanate", subscriptNumbers("CH3C6H3(NCO)2"), new Werkstoff.Stats(), @@ -947,7 +924,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff Dinitrotoluene = new Werkstoff( - new short[] {216, 191, 216}, + new short[] { 216, 191, 216 }, "Dinitrotoluene", subscriptNumbers("C7H6N2O4"), new Werkstoff.Stats(), @@ -957,7 +934,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff Diaminotoluene = new Werkstoff( - new short[] {227, 218, 201}, + new short[] { 227, 218, 201 }, "Diaminotoluene", subscriptNumbers("C6H3(NH2)2CH3"), new Werkstoff.Stats(), @@ -967,7 +944,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff TolueneTetramethylDiisocyanate = new Werkstoff( - new short[] {255, 255, 255}, + new short[] { 255, 255, 255 }, "Toluene Tetramethyl Diisocyanate", subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"), new Werkstoff.Stats(), @@ -977,7 +954,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_FLUID); public static final Werkstoff PTMEGElastomer = new Werkstoff( - new short[] {248, 248, 255}, + new short[] { 248, 248, 255 }, "PTMEG Elastomer", new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64), Werkstoff.Types.COMPOUND, @@ -986,7 +963,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MagnesiumPeroxide = new Werkstoff( - new short[] {255, 250, 205}, + new short[] { 255, 250, 205 }, "Magnesium Peroxide", subscriptNumbers("MnO2"), new Werkstoff.Stats(), @@ -996,7 +973,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff PotassiumChlorate = new Werkstoff( - new short[] {240, 255, 255}, + new short[] { 240, 255, 255 }, "Potassium Chlorate", subscriptNumbers("KClO3"), new Werkstoff.Stats(), @@ -1006,7 +983,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL); public static final Werkstoff MARM247 = new Werkstoff( - new short[] {255, 133, 145}, + new short[] { 255, 133, 145 }, "MAR-M247", new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680), Werkstoff.Types.COMPOUND, @@ -1015,7 +992,7 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_METALLIC); public static final Werkstoff DilutedAcetone = new Werkstoff( - new short[] {254, 254, 250}, + new short[] { 254, 254, 250 }, "Diluted Acetone", new Werkstoff.Stats(), Werkstoff.Types.MIXTURE, diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java index 29abece11a..800b4f3129 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/j