diff options
| author | miozune <miozune@gmail.com> | 2022-07-12 23:29:48 +0900 |
|---|---|---|
| committer | miozune <miozune@gmail.com> | 2022-07-12 23:29:48 +0900 |
| commit | 59a42b77f83aa6df5088348a0fcd93f54404bae9 (patch) | |
| tree | 4fa6b5f8fc6f91a04b67b9c9653672d6c84d7086 /src/main/java | |
| parent | 06b3d6a41d9aec66944657290f7bc0cb79395084 (diff) | |
| download | GT5-Unofficial-59a42b77f83aa6df5088348a0fcd93f54404bae9.tar.gz GT5-Unofficial-59a42b77f83aa6df5088348a0fcd93f54404bae9.tar.bz2 GT5-Unofficial-59a42b77f83aa6df5088348a0fcd93f54404bae9.zip | |
updateBuildScript & spotlessApply
Diffstat (limited to 'src/main/java')
19 files changed, 3291 insertions, 3126 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java index e15c3bcf33..a19ffd0e45 100644 --- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java +++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java @@ -1,8 +1,5 @@ package com.elisis.gtnhlanth;
-import java.util.Arrays;
-import java.util.logging.Logger;
-
import com.elisis.gtnhlanth.common.CommonProxy;
import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
import com.elisis.gtnhlanth.common.register.LanthItemList;
@@ -13,7 +10,6 @@ import com.elisis.gtnhlanth.loader.ZPMRubberChanges; import com.elisis.gtnhlanth.xmod.nei.IMC;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
@@ -26,25 +22,31 @@ import cpw.mods.fml.common.event.FMLServerStartedEvent; import gregtech.api.GregTech_API;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_Log;
+import java.util.Arrays;
+import java.util.logging.Logger;
import net.minecraftforge.oredict.OreDictionary;
-@Mod(modid = Tags.MODID, version = Tags.VERSION, name = Tags.MODNAME,
- dependencies = "required-after:IC2; " + "required-after:gregtech; "
- + "required-after:bartworks; "
- + "required-after:GoodGenerator; "
- + "before:miscutils; "
- + "required-after:dreamcraft; "
- )
+@Mod(
+ modid = Tags.MODID,
+ version = Tags.VERSION,
+ name = Tags.MODNAME,
+ dependencies = "required-after:IC2; " + "required-after:gregtech; "
+ + "required-after:bartworks; "
+ + "required-after:GoodGenerator; "
+ + "before:miscutils; "
+ + "required-after:dreamcraft; ")
public class GTNHLanthanides {
-
+
public static Logger LOG = Logger.getLogger("GTNH:Lanthanides");
-
+
@Mod.Instance
public static GTNHLanthanides instance;
-
- @SidedProxy(clientSide = "com.elisis.gtnhlanth.client.ClientProxy",serverSide = "com.elisis.gtnhlanth.common.CommonProxy")
+
+ @SidedProxy(
+ clientSide = "com.elisis.gtnhlanth.client.ClientProxy",
+ serverSide = "com.elisis.gtnhlanth.common.CommonProxy")
public static CommonProxy proxy;
-
+
@EventHandler
public static void preInit(FMLPreInitializationEvent e) {
WerkstoffAdderRegistry.addWerkstoffAdder(new WerkstoffMaterialPool());
@@ -53,14 +55,14 @@ public class GTNHLanthanides { GregTech_API.sAfterGTPostload.add(new ZPMRubberChanges());
proxy.preInit(e);
}
-
+
@EventHandler
public static void init(FMLInitializationEvent e) {
proxy.init(e);
WerkstoffMaterialPool.runInit();
IMC.IMCSender();
}
-
+
@EventHandler
public static void postInit(FMLPostInitializationEvent e) {
RecipeLoader.loadGeneral();
@@ -68,41 +70,36 @@ public class GTNHLanthanides { RecipeLoader.addRandomChemCrafting();
BotRecipes.addGTRecipe();
BotRecipes.addFuels();
- //RecipeLoader.loadZylonRecipes();
+ // RecipeLoader.loadZylonRecipes();
proxy.postInit(e);
- //GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName());
-
+ // GT_Log.out.print(FluidRegistry.getFluid("Sodium Tungstate").getName());
+
GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));
GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));
-
- GT_Log.out.print("HMMM " + Arrays.toString(OreDictionary.getOreIDs(WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
-
-
+
+ GT_Log.out.print("HMMM "
+ + Arrays.toString(OreDictionary.getOreIDs(
+ WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
}
-
+
@EventHandler
public static void onModLoadingComplete(FMLLoadCompleteEvent e) {
- GT_Log.out.print("AAAAAAAAAAAAAA");
- //
- GT_Log.out.print("We are done loading");
- BotRecipes.removeRecipes();
-
- GT_Log.out.print("blah blah " + WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot));
-
-
-
+ GT_Log.out.print("AAAAAAAAAAAAAA");
+ //
+ GT_Log.out.print("We are done loading");
+ BotRecipes.removeRecipes();
+
+ GT_Log.out.print("blah blah " + WerkstoffMaterialPool.PTMEGElastomer.hasGenerationFeature(OrePrefixes.ingot));
}
-
+
// This is horrifying and I'm sorry
@EventHandler
public static void onServerAboutToStart(FMLServerAboutToStartEvent e) {
- //RecipeLoader.removeCeriumSources();
+ // RecipeLoader.removeCeriumSources();
}
-
+
@EventHandler
public static void onServerStart(FMLServerStartedEvent e) {
- RecipeLoader.removeCeriumSources();
+ RecipeLoader.removeCeriumSources();
}
-
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/Tags.java b/src/main/java/com/elisis/gtnhlanth/Tags.java index bd71de9398..901da11c18 100644 --- a/src/main/java/com/elisis/gtnhlanth/Tags.java +++ b/src/main/java/com/elisis/gtnhlanth/Tags.java @@ -6,5 +6,4 @@ public class Tags { public static final String MODNAME = "GRADLETOKEN_MODNAME";
public static final String VERSION = "GRADLETOKEN_VERSION";
public static final String GROUPNAME = "GRADLETOKEN_GROUPNAME";
-
}
diff --git a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java index d663dcde51..e2dea1c619 100644 --- a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java +++ b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java @@ -2,6 +2,4 @@ package com.elisis.gtnhlanth.client; import com.elisis.gtnhlanth.common.CommonProxy;
-public class ClientProxy extends CommonProxy {
-
-}
+public class ClientProxy extends CommonProxy {}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/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. |
