diff options
Diffstat (limited to 'src/main/java/com/elisis/gtnhlanth/common')
6 files changed, 1091 insertions, 1270 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java index a1022cf699..8bf0c8bb46 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java +++ b/src/main/java/com/elisis/gtnhlanth/common/CommonProxy.java @@ -6,16 +6,9 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; public class CommonProxy {
- public void preInit(FMLPreInitializationEvent e) {
-
- }
+ public void preInit(FMLPreInitializationEvent e) {}
- public void init(FMLInitializationEvent e) {
-
- }
-
- public void postInit(FMLPostInitializationEvent e) {
-
- }
+ public void init(FMLInitializationEvent e) {}
+ public void postInit(FMLPostInitializationEvent e) {}
}
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 73e6ec8607..f7c2569cbb 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java @@ -1,14 +1,12 @@ package com.elisis.gtnhlanth.common.register; -import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; -import com.github.bartimaeusnek.bartworks.util.Pair; - -import static gregtech.api.enums.Materials.*; -import static gregtech.api.enums.TextureSet.*; - import static com.github.bartimaeusnek.bartworks.system.material.Werkstoff.Types.*; import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; +import static gregtech.api.enums.Materials.*; +import static gregtech.api.enums.TextureSet.*; +import com.github.bartimaeusnek.bartworks.system.material.Werkstoff; +import com.github.bartimaeusnek.bartworks.util.Pair; /* * @@ -18,20 +16,19 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers; @SuppressWarnings("unchecked") public class BotWerkstoffMaterialPool implements Runnable { - public static final Werkstoff TungsticAcid = new Werkstoff( - new short[]{0xf5, 0xf1, 0x16}, + public static final Werkstoff TungsticAcid = new Werkstoff( + new short[] {0xf5, 0xf1, 0x16}, "Tungstic Acid", new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust().enforceUnification(), 29900, SET_SHINY, - new Pair<>(Hydrogen,2), - new Pair<>(Tungsten,1), - new Pair<>(Oxygen,4) - ); + new Pair<>(Hydrogen, 2), + 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, @@ -39,384 +36,347 @@ public class BotWerkstoffMaterialPool implements Runnable { 29901, 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) -// ); + 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 AmmoniumNitrate = new Werkstoff( - new short[]{0x81,0xcc,0x00}, + new short[] {0x81, 0xcc, 0x00}, "Ammonium Nitrate", new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29903, SET_FINE, - new Pair<>(Nitrogen,1), - new Pair<>(Hydrogen,4), - new Pair<>(Nitrogen,1), - new Pair<>(Oxygen,3) - ); + new Pair<>(Nitrogen, 1), + new Pair<>(Hydrogen, 4), + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29904, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29905, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29906, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29907, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29908, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29909, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29910, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29911, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29912, - SET_FINE - ); + SET_FINE); public static final Werkstoff LMP103S = new Werkstoff( - new short[]{0xbf,0x2f,0xc2}, + new short[] {0xbf, 0x2f, 0xc2}, "LMP-103S", new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29913, - SET_FINE - ); + 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), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29915, - SET_FINE - ); + 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(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29916, - SET_METALLIC - ); - public static final Werkstoff VanadiumPentoxide = new Werkstoff( - new short[]{0x69,0x69,0x69}, + SET_METALLIC); + public static final Werkstoff VanadiumPentoxide = new Werkstoff( + new short[] {0x69, 0x69, 0x69}, "Vanadium Pentoxide", subscriptNumbers("V2O5"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29917, - SET_METALLIC - ); - public static final Werkstoff TertButylbenzene = new Werkstoff( - new short[]{0,0,0}, + SET_METALLIC); + public static final Werkstoff TertButylbenzene = new Werkstoff( + new short[] {0, 0, 0}, "Tert-Butylbenzene", subscriptNumbers("C10H14"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29918, - SET_METALLIC - ); - public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff( - new short[]{0xcc,0x86,0x5a}, + SET_METALLIC); + public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff( + new short[] {0xcc, 0x86, 0x5a}, "2-tert-butyl-anthraquinone", subscriptNumbers("C18H16O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29919, - SET_METALLIC - ); - public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff( - new short[]{0xad,0x53,0x1a}, + SET_METALLIC); + public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff( + new short[] {0xad, 0x53, 0x1a}, "2-tert-butyl-anthrahydroquinone", subscriptNumbers("C18H17O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29920, - SET_METALLIC - ); - public static final Werkstoff HydrogenPeroxide = new Werkstoff( - new short[]{0xad,0x53,0x1a}, + SET_METALLIC); + public static final Werkstoff HydrogenPeroxide = new Werkstoff( + new short[] {0xad, 0x53, 0x1a}, "Hydrogen Peroxide", subscriptNumbers("H2O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells().enforceUnification(), 29921, - SET_METALLIC - ); - public static final Werkstoff Hydrazine = new Werkstoff( - new short[]{0xb5,0x07,0x07}, + SET_METALLIC); + public static final Werkstoff Hydrazine = new Werkstoff( + new short[] {0xb5, 0x07, 0x07}, "hydrazine", subscriptNumbers("N2H4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29922, - SET_METALLIC - ); - public static final Werkstoff DimethylSulfate = new Werkstoff( - new short[]{0xff,0xfb,0x00}, + SET_METALLIC); + public static final Werkstoff DimethylSulfate = new Werkstoff( + new short[] {0xff, 0xfb, 0x00}, "Dimethyl Sulfate", subscriptNumbers("(CH3O)2SO2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29923, - SET_METALLIC - ); - public static final Werkstoff Monomethylhydrazine = new Werkstoff( - new short[]{0xff,0x61,0x00}, + SET_METALLIC); + public static final Werkstoff Monomethylhydrazine = new Werkstoff( + new short[] {0xff, 0x61, 0x00}, "Monomethylhydrazine", subscriptNumbers("CH6N2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29924, - SET_METALLIC - ); - public static final Werkstoff Formaldehyde = new Werkstoff( - new short[]{0x2e,0xd9,0x83}, + SET_METALLIC); + public static final Werkstoff Formaldehyde = new Werkstoff( + new short[] {0x2e, 0xd9, 0x83}, "Formaldehyde", subscriptNumbers("CH2O"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29925, - SET_METALLIC - ); - public static final Werkstoff EthylAcetate = new Werkstoff( - new short[]{0x0c,0xfb,0x32b}, + SET_METALLIC); + public static final Werkstoff EthylAcetate = new Werkstoff( + new short[] {0x0c, 0xfb, 0x32b}, "Ethyl Acetate", subscriptNumbers("C4H8O2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29926, - SET_METALLIC - ); - public static final Werkstoff Acetylhydrazine = new Werkstoff( - new short[]{0xd1,0x5c,0x5c}, + SET_METALLIC); + public static final Werkstoff Acetylhydrazine = new Werkstoff( + new short[] {0xd1, 0x5c, 0x5c}, "Acetylhydrazine", subscriptNumbers("C2H6N2O"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29927, - SET_METALLIC - ); - public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff( - new short[]{0x80,0x06,0x00}, + SET_METALLIC); + public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff( + new short[] {0x80, 0x06, 0x00}, "Unsymmetrical Dimethylhydrazine", subscriptNumbers("H2NN(CH3)2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29928, - SET_METALLIC - ); - public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff( - new short[]{0x78,0xe3,0xa7}, + SET_METALLIC); + public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff( + new short[] {0x78, 0xe3, 0xa7}, "Monomethylhydrazine Fuel Mix", new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29929, - SET_METALLIC - ); - public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff( - new short[]{0xc8,0xff,0x00}, + SET_METALLIC); + public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff( + new short[] {0xc8, 0xff, 0x00}, "Unsymmetrical Dimethylhydrazine Fuel Mix", new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29930, - SET_METALLIC - ); - public static final Werkstoff Nitromethane = new Werkstoff( - new short[]{0x87,0x7d,0x60}, + SET_METALLIC); + public static final Werkstoff Nitromethane = new Werkstoff( + new short[] {0x87, 0x7d, 0x60}, "Nitromethane", subscriptNumbers("CH3NO2"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29914, - SET_METALLIC - ); - public static final Werkstoff BoronTrioxide = new Werkstoff( - new short[]{0xe3,0xa6,0xd3}, + SET_METALLIC); + public static final Werkstoff BoronTrioxide = new Werkstoff( + new short[] {0xe3, 0xa6, 0xd3}, "Boron Trioxide", subscriptNumbers("B2O3"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29931, - SET_METALLIC - ); - public static final Werkstoff BoronTrifluoride = new Werkstoff( - new short[]{0xd0,0xe0,0x3f}, + SET_METALLIC); + public static final Werkstoff BoronTrifluoride = new Werkstoff( + new short[] {0xd0, 0xe0, 0x3f}, "Boron Trifluoride", subscriptNumbers("BF3"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29932, - SET_METALLIC - ); - public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff( - new short[]{0x57,0x69,0x2d}, + SET_METALLIC); + public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff( + new short[] {0x57, 0x69, 0x2d}, "Nitronium Tetrafluoroborate", subscriptNumbers("NO2BF4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29933, - SET_METALLIC - ); - public static final Werkstoff Trinitramid = new Werkstoff( - new short[]{0x28,0x2b,0x70}, + SET_METALLIC); + public static final Werkstoff Trinitramid = new Werkstoff( + new short[] {0x28, 0x2b, 0x70}, "Trinitramid", subscriptNumbers("N4O6"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29934, - SET_METALLIC - ); - public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff( - new short[]{0x28,0x2b,0x70}, + SET_METALLIC); + public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff( + new short[] {0x28, 0x2b, 0x70}, "Ammonia Boronfluoride Solution", subscriptNumbers("NH4BF4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29935, - SET_METALLIC - ); - public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff( - new short[]{0xbe,0x6e,0xe0}, + SET_METALLIC); + public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff( + new short[] {0xbe, 0x6e, 0xe0}, "Sodium Tetrafluoroborate", subscriptNumbers("NaBF4"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29936, - SET_METALLIC - ); - public static final Werkstoff SodiumFluoride = new Werkstoff( - new short[]{0x9f,0x70,0xe6}, + SET_METALLIC); + public static final Werkstoff SodiumFluoride = new Werkstoff( + new short[] {0x9f, 0x70, 0xe6}, "Sodium Fluoride", subscriptNumbers("NaF"), new Werkstoff.Stats(), COMPOUND, new Werkstoff.GenerationFeatures().onlyDust(), 29937, - SET_METALLIC - ); - public static final Werkstoff Tetrafluoroborate = new Werkstoff( - new short[]{0x6a,0x53,0x8c}, + SET_METALLIC); + public static final Werkstoff Tetrafluoroborate = new Werkstoff( + new short[] {0x6a, 0x53, 0x8c}, "Tetrafluoroboric Acid", subscriptNumbers("HBF4"), new Werkstoff.Stats().setGas(true), COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), 29938, - SET_METALLIC - ); - @Override - public void run() { - // TODO Auto-generated method stub + SET_METALLIC); - } + @Override + public void run() { + // TODO Auto-generated method stub + } } 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 14f58394d6..abed46df99 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java @@ -2,21 +2,17 @@ package com.elisis.gtnhlanth.common.register; import com.elisis.gtnhlanth.common.tileentity.Digester; import com.elisis.gtnhlanth.common.tileentity.DissolutionTank; - import net.minecraft.item.ItemStack; public final class LanthItemList { - - public static ItemStack DIGESTER; - public static ItemStack DISSOLUTION_TANK; - 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); - - } - - + public static ItemStack DIGESTER; + public static ItemStack DISSOLUTION_TANK; + + 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); + } } 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 d12fb95510..d26cb932f5 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java +++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java @@ -2,16 +2,11 @@ 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.EnumUtils; import com.github.bartimaeusnek.bartworks.util.Pair; - import gregtech.api.enums.Materials; -import gregtech.api.enums.OrePrefixes; -import gregtech.api.enums.SubTag; import gregtech.api.enums.TextureSet; +import java.util.Arrays; @SuppressWarnings({"unchecked"}) public class WerkstoffMaterialPool implements Runnable { @@ -21,28 +16,31 @@ 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. + // Misc. public static final Werkstoff Hafnium = new Werkstoff( 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 - ); + TextureSet.SET_DULL); public static final Werkstoff LowPurityHafnium = new Werkstoff( new short[] {240, 223, 208}, @@ -50,10 +48,11 @@ public class WerkstoffMaterialPool implements Runnable { 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 - ); + TextureSet.SET_DULL); public static final Werkstoff Hafnia = new Werkstoff( new short[] {247, 223, 203}, @@ -61,10 +60,11 @@ public class WerkstoffMaterialPool implements Runnable { 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 - ); + TextureSet.SET_DULL); public static final Werkstoff HafniumTetrachloride = new Werkstoff( new short[] {238, 247, 249}, @@ -74,8 +74,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 3, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff( new short[] {238, 247, 249}, @@ -85,8 +84,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().addCells(), offsetID + 4, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff HafniumIodide = new Werkstoff( new short[] {216, 60, 1}, @@ -96,43 +94,41 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 5, - TextureSet.SET_DULL - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 6, - TextureSet.SET_DULL - ); + 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 - - ); + 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(), Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 8, - TextureSet.SET_DULL - - ); + TextureSet.SET_DULL); public static final Werkstoff ZirconiumTetrachloride = new Werkstoff( new short[] {179, 164, 151}, @@ -142,8 +138,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 9, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff( new short[] {179, 164, 151}, @@ -151,10 +146,12 @@ public class WerkstoffMaterialPool implements Runnable { 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 material + 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 - ); + TextureSet.SET_FLUID); public static final Werkstoff HafniaZirconiaBlend = new Werkstoff( new short[] {247, 223, 203}, @@ -164,22 +161,24 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 11, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff Iodine = new Werkstoff( 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, - TextureSet.SET_FLUID - ); - + TextureSet.SET_FLUID); - //Lanthanide Line + // Lanthanide Line public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff( new short[] {111, 78, 55}, "Muddy Monazite Rare Earth Solution", @@ -188,8 +187,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), offsetID + 14, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff( new short[] {160, 120, 90}, @@ -199,8 +197,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), offsetID + 15, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff( new short[] {237, 201, 175}, @@ -210,8 +207,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), offsetID + 16, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff( new short[] {250, 223, 173}, @@ -221,8 +217,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), offsetID + 17, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff( new short[] {244, 202, 22}, @@ -232,8 +227,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().addCells(), offsetID + 18, - TextureSet.SET_FLUID - ); + TextureSet.SET_FLUID); public static final Werkstoff MonaziteSulfate = new Werkstoff( new short[] {152, 118, 84}, @@ -243,8 +237,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 19, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff AcidicMonazitePowder = new Werkstoff( new short[] {50, 23, 77}, @@ -254,8 +247,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 20, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff( new short[] {72, 60, 50}, @@ -265,8 +257,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 21, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff NeutralizedMonaziteRareEarthFiltrate = new Werkstoff( new short[] {50, 23, 77}, @@ -276,8 +267,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 22, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff MonaziteRareEarthHydroxideConcentrate = new Werkstoff( new short[] {193, 154, 107}, @@ -287,8 +277,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 23, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff DriedMonaziteRareEarthConcentrate = new Werkstoff( new short[] {250, 214, 165}, @@ -298,8 +287,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 24, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff CeriumDioxide = new Werkstoff( new short[] {255, 255, 255}, @@ -309,8 +297,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust().enforceUnification(), offsetID + 25, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff CeriumChloride = new Werkstoff( new short[] {255, 255, 255}, @@ -320,8 +307,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 26, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff CeriumOxalate = new Werkstoff( new short[] {255, 255, 224}, @@ -331,8 +317,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.COMPOUND, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 27, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff CeriumIIIOxide = new Werkstoff( new short[] {255, 255, 102}, @@ -345,19 +330,17 @@ public class WerkstoffMaterialPool implements Runnable { TextureSet.SET_DULL, Arrays.asList(Materials.Cerium, Materials.Oxygen), new Pair<>(Materials.Cerium, 2), - new Pair<>(Materials.Oxygen, 3) - ); + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff CeriumRichMixture = new Werkstoff( - new short[] {244, 164, 96}, - "Cerium-Rich Mixture", - subscriptNumbers("??Ce??"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 29, - TextureSet.SET_DULL - ); + new short[] {244, 164, 96}, + "Cerium-Rich Mixture", + subscriptNumbers("??Ce??"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 29, + TextureSet.SET_DULL); public static final Werkstoff CooledMonaziteRareEarthConcentrate = new Werkstoff( new short[] {250, 214, 165}, @@ -367,8 +350,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 30, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff MonaziteRarerEarthSediment = new Werkstoff( new short[] {250, 214, 165}, @@ -378,8 +360,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 31, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff MonaziteHeterogenousHalogenicRareEarthMixture = new Werkstoff( new short[] {250, 214, 165}, @@ -389,8 +370,7 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 32, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff SaturatedMonaziteRareEarthMixture = new Werkstoff( new short[] {250, 214, 165}, @@ -400,202 +380,177 @@ public class WerkstoffMaterialPool implements Runnable { Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable().onlyDust(), offsetID + 33, - TextureSet.SET_DULL - ); + TextureSet.SET_DULL); public static final Werkstoff SamaricResidue = new Werkstoff( - new short[] {248, 243, 231}, - "Samaric Residue", - subscriptNumbers("??SmGd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 34, - TextureSet.SET_DULL - ); + new short[] {248, 243, 231}, + "Samaric Residue", + subscriptNumbers("??SmGd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 34, + TextureSet.SET_DULL); public static final Werkstoff MonaziteResidue = new Werkstoff( - new short[] {64, 69, 62}, - "Monazite Residue", - subscriptNumbers("??ZrHfTh??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 35, - TextureSet.SET_DULL - ); + new short[] {64, 69, 62}, + "Monazite Residue", + subscriptNumbers("??ZrHfTh??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 35, + TextureSet.SET_DULL); public static final Werkstoff AmmoniumNitrate = new Werkstoff( - new short[] {255, 255, 255}, - "Ammonium Nitrate Solution", - subscriptNumbers("NH4NO3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 36, - TextureSet.SET_FLUID - ); + new short[] {255, 255, 255}, + "Ammonium Nitrate Solution", + subscriptNumbers("NH4NO3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 36, + TextureSet.SET_FLUID); public static final Werkstoff ThoriumPhosphateCake = new Werkstoff( - new short[] {188, 143, 143}, - "Thorium-Phosphate Cake", - subscriptNumbers("??ThP??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 37, - TextureSet.SET_DULL - ); + new short[] {188, 143, 143}, + "Thorium-Phosphate Cake", + subscriptNumbers("??ThP??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 37, + TextureSet.SET_DULL); public static final Werkstoff ThoriumPhosphateConcentrate = new Werkstoff( - new short[] {217, 144, 88}, - "Thorium-Phosphate Concentrate", - subscriptNumbers("??ThP??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 38, - TextureSet.SET_DULL - ); + new short[] {217, 144, 88}, + "Thorium-Phosphate Concentrate", + subscriptNumbers("??ThP??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 38, + TextureSet.SET_DULL); public static final Werkstoff UraniumFiltrate = new Werkstoff( - new short[] {190, 240, 94}, - "UraniumFiltrate", - subscriptNumbers("??U??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 39, - TextureSet.SET_DULL - ); + new short[] {190, 240, 94}, + "UraniumFiltrate", + subscriptNumbers("??U??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 39, + TextureSet.SET_DULL); public static final Werkstoff NeutralizedUraniumFiltrate = new Werkstoff( - new short[] {217, 120, 88}, - "Neutralized Uranium Filtrate", - subscriptNumbers("??U??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 40, - TextureSet.SET_DULL - ); + new short[] {217, 120, 88}, + "Neutralized Uranium Filtrate", + subscriptNumbers("??U??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 40, + TextureSet.SET_DULL); public static final Werkstoff SeaweedAsh = new Werkstoff( - new short[] {70, 75, 71}, - "Seaweed Ash", - new Werkstoff.Stats(), - Werkstoff.Types.BIOLOGICAL, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 41, - TextureSet.SET_DULL - ); + new short[] {70, 75, 71}, + "Seaweed Ash", + new Werkstoff.Stats(), + Werkstoff.Types.BIOLOGICAL, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 41, + TextureSet.SET_DULL); public static final Werkstoff SeaweedConcentrate = new Werkstoff( - new short[] {70, 100, 71}, - "Seaweed Concentrate", - subscriptNumbers("??I??"), - new Werkstoff.Stats(), - Werkstoff.Types.BIOLOGICAL, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 42, - TextureSet.SET_FLUID - ); + new short[] {70, 100, 71}, + "Seaweed Concentrate", + subscriptNumbers("??I??"), + new Werkstoff.Stats(), + Werkstoff.Types.BIOLOGICAL, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 42, + TextureSet.SET_FLUID); public static final Werkstoff PotassiumPermanganate = new Werkstoff( - new short[] {165, 50, 138}, - "Potassium Permanganate", - subscriptNumbers("KMnO4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 43, - TextureSet.SET_DULL - ); + new short[] {165, 50, 138}, + "Potassium Permanganate", + subscriptNumbers("KMnO4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 43, + TextureSet.SET_DULL); public static final Werkstoff PotassiumPermanganateSolution = new Werkstoff( - new short[] {165, 50, 138}, - "Potassium Permanganate Solution", - subscriptNumbers("KMnO4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 44, - TextureSet.SET_FLUID - ); - + new short[] {165, 50, 138}, + "Potassium Permanganate Solution", + subscriptNumbers("KMnO4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 44, + TextureSet.SET_FLUID); public static final Werkstoff SeaweedByproducts = new Werkstoff( - new short[] {125, 50, 138}, - "Seaweed Byproducts", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 45, - TextureSet.SET_FLUID - ); + new short[] {125, 50, 138}, + "Seaweed Byproducts", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 45, + TextureSet.SET_FLUID); public static final Werkstoff NitricLeachedMonaziteMixture = new Werkstoff( - new short[] {125, 50, 138}, - "Nitric-Leached Monazite Mixture", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID + 46, - TextureSet.SET_FLUID - ); + new short[] {125, 50, 138}, + "Nitric-Leached Monazite Mixture", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID + 46, + TextureSet.SET_FLUID); public static final Werkstoff EuropiumOxide = new Werkstoff( - new short[] {255, 255, 255}, - "Europium Oxide", - subscriptNumbers("EuO"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 47, - TextureSet.SET_DULL - ); + new short[] {255, 255, 255}, + "Europium Oxide", + subscriptNumbers("EuO"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 47, + TextureSet.SET_DULL); public static final Werkstoff EuropiumSulfide = new Werkstoff( - new short[] {5, 0, 5}, - "Europium Sulfide", - subscriptNumbers("EuS"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 48, - TextureSet.SET_DULL - ); + new short[] {5, 0, 5}, + "Europium Sulfide", + subscriptNumbers("EuS"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 48, + TextureSet.SET_DULL); public static final Werkstoff UnknownBlend = new Werkstoff( - new short[] {0, 0, 5}, - "UnknownBlend", - subscriptNumbers("?????"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID + 49, - TextureSet.SET_DULL - ); - - - + new short[] {0, 0, 5}, + "UnknownBlend", + subscriptNumbers("?????"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID + 49, + TextureSet.SET_DULL); // TODO - - - // BASTNASITE public static final Werkstoff MuddyRareEarthBastnasiteSolution = new Werkstoff( - new short[] {205, 133, 63}, - "Muddy Bastnasite Rare Earth Solution", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2, - TextureSet.SET_FLUID - ); + new short[] {205, 133, 63}, + "Muddy Bastnasite Rare Earth Solution", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2, + TextureSet.SET_FLUID); /* public static final Werkstoff FluorosilicicAcid = new Werkstoff( new short[] {205, 133, 63}, @@ -609,541 +564,476 @@ public class WerkstoffMaterialPool implements Runnable { ); */ public static final Werkstoff SodiumFluorosilicate = new Werkstoff( - new short[] {205, 133, 63}, - "Sodiumfluorosilicate", - subscriptNumbers("Na2SiF6"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 2, - TextureSet.SET_FLUID - ); + new short[] {205, 133, 63}, + "Sodiumfluorosilicate", + subscriptNumbers("Na2SiF6"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 2, + TextureSet.SET_FLUID); public static final Werkstoff SteamCrackedBasnasiteSolution = new Werkstoff( - new short[] {205, 133, 63}, - "Steam-Cracked Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 3, - TextureSet.SET_FLUID - ); + new short[] {205, 133, 63}, + "Steam-Cracked Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 3, + TextureSet.SET_FLUID); public static final Werkstoff ConditionedBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, - "Conditioned Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 4, - TextureSet.SET_FLUID - ); + new short[] {205, 133, 63}, + "Conditioned Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 4, + TextureSet.SET_FLUID); public static final Werkstoff DiltedRareEarthBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, - "Diluted Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 5, - TextureSet.SET_FLUID - ); + new short[] {205, 133, 63}, + "Diluted Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 5, + TextureSet.SET_FLUID); public static final Werkstoff FilteredBastnasiteMud = new Werkstoff( - new short[] {205, 133, 63}, - "Filtered Bastnasite Mud", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 6, - TextureSet.SET_FLUID - ); + new short[] {205, 133, 63}, + "Filtered Bastnasite Mud", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 6, + TextureSet.SET_FLUID); public static final Werkstoff BastnasiteRareEarthOxidePowder = new Werkstoff( - new short[] {205, 133, 63}, - "Bastnasite Rare Earth Oxides", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 7, - TextureSet.SET_DULL - ); + new short[] {205, 133, 63}, + "Bastnasite Rare Earth Oxides", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 7, + TextureSet.SET_DULL); public static final Werkstoff LeachedBastnasiteRareEarthOxides = new Werkstoff( - new short[] {205, 133, 63}, - "Acid-Leached Bastnasite Rare Earth Oxides", - subscriptNumbers("??LaCeY??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 8, - TextureSet.SET_DULL - ); + new short[] {205, 133, 63}, + "Acid-Leached Bastnasite Rare Earth Oxides", + subscriptNumbers("??LaCeY??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 8, + TextureSet.SET_DULL); public static final Werkstoff Gangue = new Werkstoff( - new short[] {0, 0, 0}, - "Gangue", - subscriptNumbers("Useless..."), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 9, - TextureSet.SET_DULL - ); - //TODO: Deal with colouring + new short[] {0, 0, 0}, + "Gangue", + subscriptNumbers("Useless..."), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 9, + TextureSet.SET_DULL); + // TODO: Deal with colouring public static final Werkstoff RoastedRareEarthOxides = new Werkstoff( - new short[] {160, 82, 45}, - "Roasted Rare Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 10, - TextureSet.SET_DULL - ); + new short[] {160, 82, 45}, + "Roasted Rare Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 10, + TextureSet.SET_DULL); public static final Werkstoff WetRareEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, - "Wet Rare Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 11, - TextureSet.SET_DULL - ); + new short[] {160, 82, 49}, + "Wet Rare Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 11, + TextureSet.SET_DULL); public static final Werkstoff CeriumOxidisedRareEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, - "Cerium-Oxidised Rare Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 12, - TextureSet.SET_DULL - ); + new short[] {160, 82, 49}, + "Cerium-Oxidised Rare Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 12, + TextureSet.SET_DULL); public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff( - new short[] {160, 82, 49}, - "Bastnasite Rarer Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 13, - TextureSet.SET_DULL - ); + new short[] {160, 82, 49}, + "Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 13, + TextureSet.SET_DULL); public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff( - new short[] {160, 90, 60}, - "Nitrogenated Bastnasite Rarer Earth Oxides", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 14, - TextureSet.SET_DULL - ); + new short[] {160, 90, 60}, + "Nitrogenated Bastnasite Rarer Earth Oxides", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 14, + TextureSet.SET_DULL); public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff( - new short[] {170, 90, 60}, - "Bastnasite Rarer Earth Oxide Suspension", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID2 + 15, - TextureSet.SET_DULL - ); + new short[] {170, 90, 60}, + "Bastnasite Rarer Earth Oxide Suspension", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID2 + 15, + TextureSet.SET_DULL); public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff( - new short[] {170, 90, 60}, - "Samaric Rare Earth Concentrate", - subscriptNumbers("??SmHoTb??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 16, - TextureSet.SET_DULL - ); + new short[] {170, 90, 60}, + "Samaric Rare Earth Concentrate", + subscriptNumbers("??SmHoTb??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 16, + TextureSet.SET_DULL); public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff( - new short[] {170, 90, 60}, - "Neodymium Rare Earth Concentrate", - subscriptNumbers("??LaNdPr??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 17, - TextureSet.SET_DULL - ); + new short[] {170, 90, 60}, + "Neodymium Rare Earth Concentrate", + subscriptNumbers("??LaNdPr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 17, + TextureSet.SET_DULL); public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff( - new short[] {170, 90, 60}, - "Fluorinated Neodymium Rare Earths", - subscriptNumbers("??LaNdPr??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 18, - TextureSet.SET_DULL - ); + new short[] {170, 90, 60}, + "Fluorinated Neodymium Rare Earths", + subscriptNumbers("??LaNdPr??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 18, + TextureSet.SET_DULL); public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff( - new short[] {82, 112, 102}, - "Praseodymium Tetrafluoride", - subscriptNumbers("PrF4"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 19, - TextureSet.SET_DULL, - Arrays.asList(Materials.Praseodymium, Materials.Fluorine), + new short[] {82, 112, 102}, + "Praseodymium Tetrafluoride", + subscriptNumbers("PrF4"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 19, + TextureSet.SET_DULL, + Arrays.asList(Materials.Praseodymium, Materials.Fluorine), new Pair<>(Materials.Praseodymium, 1), - new Pair<>(Materials.Fluorine, 4) - ); + new Pair<>(Materials.Fluorine, 4)); public static final Werkstoff RareEarthTrifluorides = new Werkstoff( - new short[] {82, 112, 102}, - "Rare Earth Trifluorides", - subscriptNumbers("??LaNd??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 20, - TextureSet.SET_DULL - ); + new short[] {82, 112, 102}, + "Rare Earth Trifluorides", + subscriptNumbers("??LaNd??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 20, + TextureSet.SET_DULL); public static final Werkstoff LanthaniumChloride = new Werkstoff( - new short[] {82, 112, 102}, - "Lanthanium Chloride", - subscriptNumbers("LaCl3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 21, - TextureSet.SET_DULL, - Arrays.asList(Materials.Lanthanum, Materials.Chlorine), - new Pair<>(Materials.Lanthanum, 1), - new Pair<>(Materials.Chlorine, 3) - ); + new short[] {82, 112, 102}, + "Lanthanium Chloride", + subscriptNumbers("LaCl3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 21, + TextureSet.SET_DULL, + Arrays.asList(Materials.Lanthanum, Materials.Chlorine), + new Pair<>(Materials.Lanthanum, 1), + new Pair<>(Materials.Chlorine, 3)); public static final Werkstoff NeodymiumOxide = new Werkstoff( - new short[] {82, 112, 102}, - "Neodymium Oxide", - subscriptNumbers("Nd2O3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 22, - TextureSet.SET_DULL, - Arrays.asList(Materials.Neodymium, Materials.Oxygen), - new Pair<>(Materials.Neodymium, 2), - new Pair<>(Materials.Oxygen, 3) - ); + new short[] {82, 112, 102}, + "Neodymium Oxide", + subscriptNumbers("Nd2O3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 22, + TextureSet.SET_DULL, + Arrays.asList(Materials.Neodymium, Materials.Oxygen), + new Pair<>(Materials.Neodymium, 2), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff( - new short[] {255, 182, 193}, - "Fluorinated Samaric Concentrate", - subscriptNumbers("??SmHo??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 23, - TextureSet.SET_DULL - ); + new short[] {255, 182, 193}, + "Fluorinated Samaric Concentrate", + subscriptNumbers("??SmHo??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 23, + TextureSet.SET_DULL); public static final Werkstoff CalciumFluoride = new Werkstoff( - new short[] {255, 250, 250}, - "Calcium Fluoride", - subscriptNumbers("CaF2"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(), - offsetID2 + 24, - TextureSet.SET_DULL, - Arrays.asList(Materials.Calcium, Materials.Fluorine), - new Pair<>(Materials.Calcium, 1), - new Pair<>(Materials.Fluorine, 2) - ); + new short[] {255, 250, 250}, + "Calcium Fluoride", + subscriptNumbers("CaF2"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addCells(), + offsetID2 + 24, + TextureSet.SET_DULL, + Arrays.asList(Materials.Calcium, Materials.Fluorine), + new Pair<>(Materials.Calcium, 1), + new Pair<>(Materials.Fluorine, 2)); public static final Werkstoff SamariumTerbiumMixture = new Werkstoff( - new short[] {223, 182, 193}, - "Samarium-Terbium Mixture", - subscriptNumbers("??SmTb??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 25, - TextureSet.SET_DULL - ); + new short[] {223, 182, 193}, + "Samarium-Terbium Mixture", + subscriptNumbers("??SmTb??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 25, + TextureSet.SET_DULL); public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff( - new short[] {223, 182, 193}, - "Nitrogenated Samarium-Terbium Mixture", - subscriptNumbers("??SmTb??NH4NO3"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 26, - TextureSet.SET_DULL - ); + new short[] {223, 182, 193}, + "Nitrogenated Samarium-Terbium Mixture", + subscriptNumbers("??SmTb??NH4NO3"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 26, + TextureSet.SET_DULL); public static final Werkstoff TerbiumNitrate = new Werkstoff( - new short[] {167, 252, 0}, - "Terbium Nitrate", - subscriptNumbers("TbNO3"), - new Werkstoff.Stats().setElektrolysis(true), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 27, - TextureSet.SET_DULL, - Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen), - new Pair<>(Materials.Terbium, 1), - new Pair<>(Materials.Nitrogen, 1), - new Pair<>(Materials.Oxygen, 3) - ); + new short[] {167, 252, 0}, + "Terbium Nitrate", + subscriptNumbers("TbNO3"), + new Werkstoff.Stats().setElektrolysis(true), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 27, + TextureSet.SET_DULL, + Arrays.asList(Materials.Terbium, Materials.Nitrogen, Materials.Oxygen), + new Pair<>(Materials.Terbium, 1), + new Pair<>(Materials.Nitrogen, 1), + new Pair<>(Materials.Oxygen, 3)); public static final Werkstoff SamariumOreConcentrate = new Werkstoff( - new short[] {255, 200, 230}, - "Samarium Ore Concentrate", - subscriptNumbers("??Sm??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 28, - TextureSet.SET_DULL - ); + new short[] {255, 200, 230}, + "Samarium Ore Concentrate", + subscriptNumbers("??Sm??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 28, + TextureSet.SET_DULL); public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff( - new short[] {255, 170, 220}, - "Dephosphated Samarium Concentrate", - subscriptNumbers("??Sm??"), - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID2 + 29, - TextureSet.SET_DULL - ); - - + new short[] {255, 170, 220}, + "Dephosphated Samarium Concentrate", + subscriptNumbers("??Sm??"), + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID2 + 29, + TextureSet.SET_DULL); // Weird/Exciting Chemicals public static final Werkstoff Tetrahydrofuran = new Werkstoff( - new short[] {222, 165, 164}, - "Tetrahydrofuran", - subscriptNumbers("(CH2)4O"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3, - TextureSet.SET_FLUID - ); + new short[] {222, 165, 164}, + "Tetrahydrofuran", + subscriptNumbers("(CH2)4O"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3, + TextureSet.SET_FLUID); - //1,4-Butanediol + // 1,4-Butanediol public static final Werkstoff Butanediol = new Werkstoff( - new short[] {185, 78, 72}, - "1,4-Butanediol", - subscriptNumbers("HO(CH2)4OH"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 1, - TextureSet.SET_FLUID - ); + new short[] {185, 78, 72}, + "1,4-Butanediol", + subscriptNumbers("HO(CH2)4OH"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 1, + TextureSet.SET_FLUID); - //Acidicised 1,4-Butanediol + // Acidicised 1,4-Butanediol public static final Werkstoff AcidicButanediol = new Werkstoff( - new short[] {255, 239, 213}, - "Acidicised 1,4-Butanediol", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 2, - TextureSet.SET_FLUID - ); + new short[] {255, 239, 213}, + "Acidicised 1,4-Butanediol", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 2, + TextureSet.SET_FLUID); - //Tellurium-Molybdenum-Oxide Catalyst - public static final Werkstoff MoTeOCatalyst= new Werkstoff( - new short[] {238, 131, 238}, - "Tellurium-Molybdenum-Oxide Catalyst", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 3, - TextureSet.SET_DULL - ); + // Tellurium-Molybdenum-Oxide Catalyst + public static final Werkstoff MoTeOCatalyst = new Werkstoff( + new short[] {238, 131, 238}, + "Tellurium-Molybdenum-Oxide Catalyst", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 3, + TextureSet.SET_DULL); - //Tellurium Oxide + // Tellurium Oxide public static final Werkstoff TelluriumIVOxide = new Werkstoff( - new short[] {229, 199, 187}, - "Tellurium (IV) Oxide", - subscriptNumbers("TeO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 4, - TextureSet.SET_DULL - ); + new short[] {229, 199, 187}, + "Tellurium (IV) Oxide", + subscriptNumbers("TeO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 4, + TextureSet.SET_DULL); public static final Werkstoff MolybdenumIVOxide = new Werkstoff( - new short[] {52, 53, 57}, - "Molybdenum (IV) Oxide", - subscriptNumbers("MoO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 5, - TextureSet.SET_DULL - ); + new short[] {52, 53, 57}, + "Molybdenum (IV) Oxide", + subscriptNumbers("MoO2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 5, + TextureSet.SET_DULL); public static final Werkstoff Polytetrahydrofuran = new Werkstoff( - new short[] {192, 128, 129}, - "Polytetrahydrofuran", - subscriptNumbers("(C4H8O)OH2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(), - offsetID3 + 6, - TextureSet.SET_DULL - ); + new short[] {192, 128, 129}, + "Polytetrahydrofuran", + subscriptNumbers("(C4H8O)OH2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addCells(), + offsetID3 + 6, + TextureSet.SET_DULL); public static final Werkstoff TungstophosphoricAcid = new Werkstoff( - new short[] {223, 255, 0}, - "Tungstophosphoric Acid", - subscriptNumbers("H3PW12O40"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 7, - TextureSet.SET_FLUID - ); + new short[] {223, 255, 0}, + "Tungstophosphoric Acid", + subscriptNumbers("H3PW12O40"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 7, + TextureSet.SET_FLUID); public static final Werkstoff TolueneDiisocyanate = new Werkstoff( - new short[] {255, 255, 102}, - "Toluene Diisocyanate", - subscriptNumbers("CH3C6H3(NCO)2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 8, - TextureSet.SET_FLUID - ); + new short[] {255, 255, 102}, + "Toluene Diisocyanate", + subscriptNumbers("CH3C6H3(NCO)2"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 8, + TextureSet.SET_FLUID); public static final Werkstoff Dinitrotoluene = new Werkstoff( - new short[] {216, 191, 216}, - "Dinitrotoluene", - subscriptNumbers("C7H6N2O4"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 9, - TextureSet.SET_FLUID - ); + new short[] {216, 191, 216}, + "Dinitrotoluene", + subscriptNumbers("C7H6N2O4"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 9, + TextureSet.SET_FLUID); public static final Werkstoff Diaminotoluene = new Werkstoff( - new short[] {227, 218, 201}, - "Diaminotoluene", - subscriptNumbers("C6H3(NH2)2CH3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 10, - TextureSet.SET_FLUID - ); + new short[] {227, 218, 201}, + "Diaminotoluene", + subscriptNumbers("C6H3(NH2)2CH3"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 10, + TextureSet.SET_FLUID); public static final Werkstoff TolueneTetramethylDiisocyanate = new Werkstoff( - new short[] {255, 255, 255}, - "Toluene Tetramethyl Diisocyanate", - subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 11, - TextureSet.SET_FLUID - ); + new short[] {255, 255, 255}, + "Toluene Tetramethyl Diisocyanate", + subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"), + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 11, + TextureSet.SET_FLUID); public static final Werkstoff PTMEGElastomer = new Werkstoff( - new short[] {248, 248, 255}, - "PTMEG Elastomer", - new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMolten() - .addMetalItems() - , - offsetID3 + 12, - TextureSet.SET_DULL - ); - + new short[] {248, 248, 255}, + "PTMEG Elastomer", + new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), + offsetID3 + 12, + TextureSet.SET_DULL); public static final Werkstoff MagnesiumPeroxide = new Werkstoff( - new short[] {255, 250, 205}, - "Magnesium Peroxide", + new short[] {255, 250, 205}, + "Magnesium Peroxide", subscriptNumbers("MnO2"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust(), - offsetID3 + 13, - TextureSet.SET_METALLIC - ); + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust(), + offsetID3 + 13, + TextureSet.SET_METALLIC); public static final Werkstoff PotassiumChlorate = new Werkstoff( - new short[] {240, 255, 255}, - "Potassium Chlorate", + new short[] {240, 255, 255}, + "Potassium Chlorate", subscriptNumbers("KClO3"), - new Werkstoff.Stats(), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), - offsetID3 + 14, - TextureSet.SET_DULL - ); + new Werkstoff.Stats(), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten(), + offsetID3 + 14, + TextureSet.SET_DULL); public static final Werkstoff MARM247 = new Werkstoff( - new short[] {255, 133, 145}, - "MAR-M247", - new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680), - Werkstoff.Types.COMPOUND, - new Werkstoff.GenerationFeatures().disable() - .onlyDust() - .addMolten() - .addMetalItems() - , - offsetID3 + 15, - TextureSet.SET_METALLIC - ); + new short[] {255, 133, 145}, + "MAR-M247", + new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680), + Werkstoff.Types.COMPOUND, + new Werkstoff.GenerationFeatures().disable().onlyDust().addMolten().addMetalItems(), + offsetID3 + 15, + TextureSet.SET_METALLIC); public static final Werkstoff DilutedAcetone = new Werkstoff( - new short[] {254, 254, 250}, - "Diluted Acetone", - new Werkstoff.Stats(), - Werkstoff.Types.MIXTURE, - new Werkstoff.GenerationFeatures().disable().addCells(), - offsetID3 + 16, - TextureSet.SET_FLUID - ); - + new short[] {254, 254, 250}, + "Diluted Acetone", + new Werkstoff.Stats(), + Werkstoff.Types.MIXTURE, + new Werkstoff.GenerationFeatures().disable().addCells(), + offsetID3 + 16, + TextureSet.SET_FLUID); public static void runInit() { - addSubTags(); - + addSubTags(); } private static void addSubTags() { - //WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY); + // WerkstoffMaterialPool.PTMEGElastomer.add(SubTag.BOUNCY, SubTag.STRETCHY); } - - - @Override - public void run() { - - } - - + public void run() {} } 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 5e3d552b20..2433458a02 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java @@ -12,15 +12,11 @@ import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GT_StructureUtility.ofCoil; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; -import java.util.ArrayList; -import java.util.Arrays; - import com.elisis.gtnhlanth.loader.RecipeAdder; import com.elisis.gtnhlanth.util.DescTextLocalization; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; - import gregtech.api.GregTech_API; import gregtech.api.enums.HeatingCoilLevel; import gregtech.api.gui.GT_GUIContainer_MultiMachine; @@ -32,177 +28,177 @@ import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; +import java.util.ArrayList; +import java.util.Arrays; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; - public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> implements IConstructable { - + protected int casingAmount = 0; protected int height = 0; - + private HeatingCoilLevel heatLevel; - - private IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder() - .addShape(mName, transpose(new String[][] { - {"-------", "-ttttt-", "-t---t-", "-t---t-", "-t---t-", "-ttttt-", "-------"}, - {"--ttt--", "-t---t-", "t-----t", "t-----t", "t-----t", "-t---t-", "--ttt--"}, - {"-tccct-", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", "-tccct-"}, - {"-tt~tt-", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", "-ttttt-"}, - - - - - - })) - .addElement('t', ofChain( - ofHatchAdder(Digester::addInputToMachineList, 47, 1), - ofHatchAdder(Digester::addOutputToMachineList, 47, 1), - ofHatchAdder(Digester::addEnergyInputToMachineList, 47, 1), - ofHatchAdder(Digester::addMaintenanceToMachineList, 47, 1), - ofHatchAdder(Digester::addMufflerToMachineList, 47, 1), - ofBlock(GregTech_API.sBlockCasings4, 0) - )) - .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) - .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1)) - .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)) - .build(); - - - //private int mHeat; - //private int mNeededHeat; - + + private IStructureDefinition<Digester> multiDefinition = StructureDefinition.<Digester>builder() + .addShape(mName, transpose(new String[][] { + {"-------", "-ttttt-", "-t---t-", "-t---t-", "-t---t-", "-ttttt-", "-------"}, + {"--ttt--", "-t---t-", "t-----t", "t-----t", "t-----t", "-t---t-", "--ttt--"}, + {"-tccct-", "tc---ct", "c-----c", "c-----c", "c-----c", "tc---ct", "-tccct-"}, + {"-tt~tt-", "thhhhht", "thsssht", "thsssht", "thsssht", "thhhhht", "-ttttt-"}, + })) + .addElement( + 't', + ofChain( + ofHatchAdder(Digester::addInputToMachineList, 47, 1), + ofHatchAdder(Digester::addOutputToMachineList, 47, 1), + ofHatchAdder(Digester::addEnergyInputToMachineList, 47, 1), + ofHatchAdder(Digester::addMaintenanceToMachineList, 47, 1), + ofHatchAdder(Digester::addMufflerToMachineList, 47, 1), + ofBlock(GregTech_API.sBlockCasings4, 0))) + .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) + .addElement('s', ofBlock(GregTech_API.sBlockCasings4, 1)) + .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)) + .build(); + + // private int mHeat; + // private int mNeededHeat; public Digester(String name) { - super(name); + super(name); + } + + public Digester(int id, String name, String nameRegional) { + super(id, name, nameRegional); } - public Digester(int id, String name, String nameRegional) { - super(id, name, nameRegional); - } - - @Override + @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { return checkPiece(mName, 3, 3, 0); } - - @Override + + @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; } - - public HeatingCoilLevel getCoilLevel() { - return this.heatLevel; - } - - public void setCoilLevel(HeatingCoilLevel level) { - this.heatLevel = level; - } - - @Override - public boolean checkRecipe(ItemStack itemStack) { - GT_Log.out.print("in checkRecipe\n"); - - ArrayList<FluidStack> tFluidInputs = this.getStoredFluids(); - FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]); - ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]); - long tVoltage = this.getMaxInputVoltage(); - - GT_Log.out.print(Arrays.toString(mInventory)); - - //Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList; - GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes.findRecipe( - getBaseMetaTileEntity(), - false, - tVoltage, - tFluidInputArray, - tItems - ); - - if (tRecipe == null) - return false; - //GT_Log.out.print("Recipe not null\n"); - if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) { - //GT_Log.out.print("in isRecipeInputEqual\n"); - this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); - - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1) - return false; - - if (this.mEUt > 0) - this.mEUt = (-this.mEUt); - //GT_Log.out.print("valid values"); - - if (tRecipe.mSpecialValue > this.getCoilLevel().getHeat()) - return false; - //GT_Log.out.print("Coils good\n"); - //GT_Log.out.print(tRecipe.getFluidOutput(0).getLocalizedName()); - this.mOutputFluids = new FluidStack[] { - tRecipe.getFluidOutput(0) - }; - - this.mOutputItems = new ItemStack[] { - tRecipe.getOutput(0) - }; - return true; - } - return false; - } - - @Override - public int getMaxEfficiency(ItemStack itemStack) { - return 10000; - } - - @Override + + public HeatingCoilLevel getCoilLevel() { + return this.heatLevel; + } + + public void setCoilLevel(HeatingCoilLevel level) { + this.heatLevel = level; + } + + @Override + public boolean checkRecipe(ItemStack itemStack) { + GT_Log.out.print("in checkRecipe\n"); + + ArrayList<FluidStack> tFluidInputs = this.getStoredFluids(); + FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]); + ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]); + long tVoltage = this.getMaxInputVoltage(); + + GT_Log.out.print(Arrays.toString(mInventory)); + + // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList; + GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes.findRecipe( + getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems); + + if (tRecipe == null) return false; + // GT_Log.out.print("Recipe not null\n"); + if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) { + // GT_Log.out.print("in isRecipeInputEqual\n"); + this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + + if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1) return false; + + if (this.mEUt > 0) this.mEUt = (-this.mEUt); + // GT_Log.out.print("valid values"); + + if (tRecipe.mSpecialValue > this.getCoilLevel().getHeat()) return false; + // GT_Log.out.print("Coils good\n"); + // GT_Log.out.print(tRecipe.getFluidOutput(0).getLocalizedName()); + this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)}; + + this.mOutputItems = new ItemStack[] {tRecipe.getOutput(0)}; + return true; + } + return false; + } + + @Override + public int getMaxEfficiency(ItemStack itemStack) { + return 10000; + } + + @Override public int getPollutionPerTick(ItemStack aStack) { return 200; } - - @Override + + @Override public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) { return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Digester.png"); } - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) { - return new Digester(this.mName); - } - - @Override - public void construct(ItemStack itemStack, boolean b) { - buildPiece(mName,itemStack, b, 3, 3, 0); - - } - - @Override - public String[] getStructureDescription(ItemStack arg0) { - return DescTextLocalization.addText("Digester.hint", 6); - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, - boolean redstone) { - - // Oil Cracker textures cuz I'm lazy - - if (side == facing) { - if (active) return new ITexture[]{casingTexturePages[0][47], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow().build()}; - return new ITexture[]{casingTexturePages[0][47], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build()}; + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) { + return new Digester(this.mName); + } + + @Override + public void construct(ItemStack itemStack, boolean b) { + buildPiece(mName, itemStack, b, 3, 3, 0); + } + + @Override + public String[] getStructureDescription(ItemStack arg0) { + return DescTextLocalization.addText("Digester.hint", 6); + } + + @Override + public ITexture[] getTexture( + IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, boolean redstone) { + + // Oil Cracker textures cuz I'm lazy + + if (side == facing) { + if (active) + return new ITexture[] { + casingTexturePages[0][47], + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() + }; + return new ITexture[] { + casingTexturePages[0][47], + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW) + .extFacing() + .glow() + .build() + }; } - return new ITexture[]{casingTexturePages[0][47]}; + return new ITexture[] {casingTexturePages[0][47]}; } - @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Digester") .addInfo("Controller block for the Digester") .addInfo("Input ores and fluid, output water.") @@ -217,23 +213,22 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> .addMufflerHatch("Hint block with dot 1") .toolTipFinisher("GTNH: Lanthanides"); return tt; - } - - @Override - public IStructureDefinition<Digester> getStructureDefinition() { - return multiDefinition; - } + } - @Override - public boolean explodesOnComponentBreak(ItemStack arg0) { - // TODO Auto-generated method stub - return false; - } + @Override + public IStructureDefinition<Digester> getStructureDefinition() { + return multiDefinition; + } - @Override - public int getDamageToComponent(ItemStack arg0) { - // TODO Auto-generated method stub - return 0; - } + @Override + public boolean explodesOnComponentBreak(ItemStack arg0) { + // TODO Auto-generated method stub + return false; + } + @Override + public int getDamageToComponent(ItemStack arg0) { + // TODO Auto-generated method stub + return 0; + } } diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java index b34a89a1b3..b6aa1dd172 100644 --- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java +++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java @@ -12,19 +12,12 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_FRONT_OIL_CRACKER_G import static gregtech.api.enums.Textures.BlockIcons.casingTexturePages; import static gregtech.api.util.GT_StructureUtility.ofHatchAdder; -import java.util.ArrayList; -import java.util.Arrays; - -import org.lwjgl.input.Keyboard; - import com.elisis.gtnhlanth.loader.RecipeAdder; import com.elisis.gtnhlanth.util.DescTextLocalization; import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry; -import com.github.bartimaeusnek.bartworks.util.BW_Util; import com.gtnewhorizon.structurelib.alignment.constructable.IConstructable; import com.gtnewhorizon.structurelib.structure.IStructureDefinition; import com.gtnewhorizon.structurelib.structure.StructureDefinition; - import gregtech.api.GregTech_API; import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ISecondaryDescribable; @@ -33,228 +26,225 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMultiBlockBase; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_Log; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; import gregtech.api.util.GT_Recipe; +import java.util.ArrayList; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.fluids.FluidStack; -public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank> implements IConstructable, ISecondaryDescribable { - - private IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder() - .addShape(mName, transpose(new String[][] { - {"-sss-", "sssss", "sssss", "sssss", "-sss-"}, - {"sgggs", "g---g", "g---g", "g---g", "sgggs"}, - {"sgggs", "g---g", "g---g", "g---g", "sgggs"}, - {"ss~ss", "shhhs", "shhhs", "shhhs", "sssss"}, - {"s---s", "-----", "-----", "-----", "s---s"} - })) - .addElement('s', ofChain( - ofHatchAdder(DissolutionTank::addInputToMachineList, 49, 1), - ofHatchAdder(DissolutionTank::addOutputToMachineList, 49, 1), - ofHatchAdder(DissolutionTank::addEnergyInputToMachineList, 49, 1), - ofHatchAdder(DissolutionTank::addMaintenanceToMachineList, 49, 1), - ofHatchAdder(DissolutionTank::addMufflerToMachineList, 49, 1), - ofBlock(GregTech_API.sBlockCasings4, 1) - )) - .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) - .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1)) - .build(); - - public DissolutionTank(String name) { - super(name); +public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank> + implements IConstructable, ISecondaryDescribable { + + private IStructureDefinition<DissolutionTank> multiDefinition = StructureDefinition.<DissolutionTank>builder() + .addShape(mName, transpose(new String[][] { + {"-sss-", "sssss", "sssss", "sssss", "-sss-"}, + {"sgggs", "g---g", "g---g", "g---g", "sgggs"}, + {"sgggs", "g---g", "g---g", "g---g", "sgggs"}, + {"ss~ss", "shhhs", "shhhs", "shhhs", "sssss"}, + {"s---s", "-----", "-----", "-----", "s---s"} + })) + .addElement( + 's', + ofChain( + ofHatchAdder(DissolutionTank::addInputToMachineList, 49, 1), + ofHatchAdder(DissolutionTank::addOutputToMachineList, 49, 1), + ofHatchAdder(DissolutionTank::addEnergyInputToMachineList, 49, 1), + ofHatchAdder(DissolutionTank::addMaintenanceToMachineList, 49, 1), + ofHatchAdder(DissolutionTank::addMufflerToMachineList, 49, 1), + ofBlock(GregTech_API.sBlockCasings4, 1))) + .addElement('h', ofBlock(GregTech_API.sBlockCasings1, 11)) + .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1)) + .build(); + + public DissolutionTank(String name) { + super(name); } - public DissolutionTank(int id, String name, String nameRegional) { - super(id, name, nameRegional); - } - - @Override - public IStructureDefinition<DissolutionTank> getStructureDefinition(){ - return multiDefinition; - } - - @Override + public DissolutionTank(int id, String name, String nameRegional) { + super(id, name, nameRegional); + } + + @Override + public IStructureDefinition<DissolutionTank> getStructureDefinition() { + return multiDefinition; + } + + @Override public boolean checkMachine(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack) { return checkPiece(mName, 2, 3, 0); } - - @Override + + @Override public boolean isCorrectMachinePart(ItemStack aStack) { return true; } - - private boolean addGlass(Block block, int meta) { - if (block != ItemRegistry.bw_glasses[0]) { - return false; - } - else { - return true; - } - - } - - @Override - public boolean checkRecipe(ItemStack itemStack) { - - //GT_Log.out.print("in checkRecipe"); - - ArrayList<FluidStack> tFluidInputs = this.getStoredFluids(); - FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]); - ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]); - long tVoltage = this.getMaxInputVoltage(); - - //Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList; - GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes.findRecipe( - getBaseMetaTileEntity(), - false, - tVoltage, - tFluidInputArray, - tItems - ); - - if (tRecipe == null) - return false; - - //GT_Log.out.print("Recipe not null\n"); - if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) { - - this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; - this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); - - if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1) - return false; - - if (this.mEUt > 0) - this.mEUt = (-this.mEUt); - - FluidStack majorGenericFluid = tRecipe.mFluidInputs[0]; - FluidStack minorGenericFluid = tRecipe.mFluidInputs[1]; - - FluidStack majorInput = null; - FluidStack minorInput = null; - - int majorAmount = 0; - int minorAmount = 0; - - FluidStack fluidInputOne = tFluidInputs.get(0); - FluidStack fluidInputTwo = tFluidInputs.get(1); - - majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) ? fluidInputOne : fluidInputTwo); - //GT_Log.out.print(majorInput.getLocalizedName()); - if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) { - if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) { - majorInput = fluidInputOne; - majorAmount = fluidInputOne.amount; - minorInput = fluidInputTwo; - minorAmount = fluidInputTwo.amount; - //GT_Log.out.print("in first IF"); - } - else - return false; // No valid other input - - } else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) { - if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) { - majorInput = fluidInputTwo; - majorAmount = fluidInputTwo.amount; - minorInput = fluidInputOne; - minorAmount = fluidInputOne.amount; - //GT_Log.out.print("in second if"); - } - else - return false; - - } - else - return false; - - //GT_Log.out.print("out of switch weirdness"); - - /* - for (FluidStack fluid : tFluidInputs) { - String name = fluid.getUnlocalizedName(); - if (name == majorGenericFluid.getUnlocalizedName()) - majorInput = fluid; - - else if (name == minorGenericFluid.getUnlocalizedName()) - minorInput = fluid; - } - */ - if (majorInput == null || minorInput == null) - return false; - - //GT_Log.out.print("major " + majorInput.getLocalizedName()); - //GT_Log.out.print("minor " + minorInput.getLocalizedName()); - - //GT_Log.out.print("mjrinputamt " + majorInput.amount); - /* - if ((majorInput.amount / tRecipe.mSpecialValue) != (minorInput.amount)) - return false; - */ - if ((majorAmount / tRecipe.mSpecialValue) != (minorAmount)) - return false; - - this.mOutputFluids = new FluidStack[] { - tRecipe.getFluidOutput(0) - }; - this.mOutputItems = new ItemStack[] { - tRecipe.getOutput(0) - }; - return true; - } - return false; - } - - @Override - public int getMaxEfficiency(ItemStack itemStack) { - return 10000; - } - - @Override + + private boolean addGlass(Block block, int meta) { + if (block != ItemRegistry.bw_glasses[0]) { + return false; + } else { + return true; + } + } + + @Override + public boolean checkRecipe(ItemStack itemStack) { + + // GT_Log.out.print("in checkRecipe"); + + ArrayList<FluidStack> tFluidInputs = this.getStoredFluids(); + FluidStack[] tFluidInputArray = tFluidInputs.toArray(new FluidStack[0]); + ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]); + long tVoltage = this.getMaxInputVoltage(); + + // Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList; + GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes.findRecipe( + getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems); + + if (tRecipe == null) return false; + + // GT_Log.out.print("Recipe not null\n"); + if (tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) { + + this.mEfficiency = (10000 - (this.getIdealStatus() - this.getRepairStatus()) * 1000); + this.mEfficiencyIncrease = 10000; + this.calculateOverclockedNessMulti(tRecipe.mEUt, tRecipe.mDuration, 1, tVoltage); + + if (mMaxProgresstime == Integer.MAX_VALUE - 1 && this.mEUt == Integer.MAX_VALUE - 1) return false; + + if (this.mEUt > 0) this.mEUt = (-this.mEUt); + + FluidStack majorGenericFluid = tRecipe.mFluidInputs[0]; + FluidStack minorGenericFluid = tRecipe.mFluidInputs[1]; + + FluidStack majorInput = null; + FluidStack minorInput = null; + + int majorAmount = 0; + int minorAmount = 0; + + FluidStack fluidInputOne = tFluidInputs.get(0); + FluidStack fluidInputTwo = tFluidInputs.get(1); + + majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) + ? fluidInputOne + : fluidInputTwo); + // GT_Log.out.print(majorInput.getLocalizedName()); + if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) { + if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) { + majorInput = fluidInputOne; + majorAmount = fluidInputOne.amount; + minorInput = fluidInputTwo; + minorAmount = fluidInputTwo.amount; + // GT_Log.out.print("in first IF"); + } else return false; // No valid other input + + } else if (fluidInputTwo.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) { + if (fluidInputOne.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) { + majorInput = fluidInputTwo; + majorAmount = fluidInputTwo.amount; + minorInput = fluidInputOne; + minorAmount = fluidInputOne.amount; + // GT_Log.out.print("in second if"); + } else return false; + + } else return false; + + // GT_Log.out.print("out of switch weirdness"); + + /* + for (FluidStack fluid : tFluidInputs) { + String name = fluid.getUnlocalizedName(); + if (name == majorGenericFluid.getUnlocalizedName()) + majorInput = fluid; + + else if (name == minorGenericFluid.getUnlocalizedName()) + minorInput = fluid; + } + */ + if (majorInput == null || minorInput == null) return false; + + // GT_Log.out.print("major " + majorInput.getLocalizedName()); + // GT_Log.out.print("minor " + minorInput.getLocalizedName()); + + // GT_Log.out.print("mjrinputamt " + majorInput.amount); + /* + if ((majorInput.amount / tRecipe.mSpecialValue) != (minorInput.amount)) + return false; + */ + if ((majorAmount / tRecipe.mSpecialValue) != (minorAmount)) return false; + + this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)}; + this.mOutputItems = new ItemStack[] {tRecipe.getOutput(0)}; + return true; + } + return false; + } + + @Override + public int getMaxEfficiency(ItemStack itemStack) { + return 10000; + } + + @Override public Object getClientGUI(int id, InventoryPlayer playerInventory, IGregTechTileEntity metaTileEntity) { return new GT_GUIContainer_MultiMachine(playerInventory, metaTileEntity, getLocalName(), "Disstank.png"); } - - - - @Override - public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) { - return new DissolutionTank(this.mName); - } - - @Override - public void construct(ItemStack itemStack, boolean b) { - buildPiece(mName, itemStack, b, 2, 3, 0); - - } - - @Override - public String[] getStructureDescription(ItemStack arg0) { - return DescTextLocalization.addText("DissolutionTank.hint", 4); - } - - @Override - public ITexture[] getTexture(IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, - boolean redstone) { - - if (side == facing) { - if (active) return new ITexture[]{casingTexturePages[0][49], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW).extFacing().glow().build()}; - return new ITexture[]{casingTexturePages[0][49], - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER).extFacing().build(), - TextureFactory.builder().addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW).extFacing().glow().build()}; + + @Override + public IMetaTileEntity newMetaEntity(IGregTechTileEntity arg0) { + return new DissolutionTank(this.mName); + } + + @Override + public void construct(ItemStack itemStack, boolean b) { + buildPiece(mName, itemStack, b, 2, 3, 0); + } + + @Override + public String[] getStructureDescription(ItemStack arg0) { + return DescTextLocalization.addText("DissolutionTank.hint", 4); + } + + @Override + public ITexture[] getTexture( + IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, boolean redstone) { + + if (side == facing) { + if (active) + return new ITexture[] { + casingTexturePages[0][49], + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_ACTIVE_GLOW) + .extFacing() + .glow() + .build() + }; + return new ITexture[] { + casingTexturePages[0][49], + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER) + .extFacing() + .build(), + TextureFactory.builder() + .addIcon(OVERLAY_FRONT_OIL_CRACKER_GLOW) + .extFacing() + .glow() + .build() + }; } - return new ITexture[]{casingTexturePages[0][49]}; - - } - - @Override - protected GT_Multiblock_Tooltip_Builder createTooltip() { - final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); + return new ITexture[] {casingTexturePages[0][49]}; + } + + @Override + protected GT_Multiblock_Tooltip_Builder createTooltip() { + final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Dissolution Tank") .addInfo("Controller block for the Dissolution Tank") .addInfo("Input Water and Fluid, output Fluid") @@ -268,20 +258,17 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di .addOutputBus("Hint block with dot 2") .addMaintenanceHatch("Hint block with dot 2") .toolTipFinisher("GTNH: Lanthanides"); - - return tt; - } - - @Override - public boolean explodesOnComponentBreak(ItemStack arg0) { - return false; - } - @Override - public int getDamageToComponent(ItemStack arg0) { - return 0; - } + return tt; + } - + @Override + public boolean explodesOnComponentBreak(ItemStack arg0) { + return false; + } + @Override + public int getDamageToComponent(ItemStack arg0) { + return 0; + } } |