aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-29 11:07:19 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-29 11:07:19 -0800
commit3e18e9fff0dc5d787f68411b296feec251382069 (patch)
tree64e28a02ca615331b60c3e3c6df55a890532f1df /src
parenteb5e2b8185d10b3ffdd8f05a203f75a6ac1f4de9 (diff)
downloadGT5-Unofficial-3e18e9fff0dc5d787f68411b296feec251382069.tar.gz
GT5-Unofficial-3e18e9fff0dc5d787f68411b296feec251382069.tar.bz2
GT5-Unofficial-3e18e9fff0dc5d787f68411b296feec251382069.zip
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java16
-rw-r--r--src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java3
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java109
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java7
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java263
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java87
-rw-r--r--src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java93
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java225
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java3
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java137
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java494
-rw-r--r--src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java138
-rw-r--r--src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java9
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java3
-rw-r--r--src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java1
15 files changed, 673 insertions, 915 deletions
diff --git a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
index 9a597ae710..a22d58e0f9 100644
--- a/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
+++ b/src/main/java/com/elisis/gtnhlanth/GTNHLanthanides.java
@@ -1,5 +1,10 @@
package com.elisis.gtnhlanth;
+import java.util.Arrays;
+import java.util.logging.Logger;
+
+import net.minecraftforge.oredict.OreDictionary;
+
import com.elisis.gtnhlanth.common.CommonProxy;
import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
import com.elisis.gtnhlanth.common.register.LanthItemList;
@@ -9,6 +14,7 @@ import com.elisis.gtnhlanth.loader.RecipeLoader;
import com.elisis.gtnhlanth.xmod.nei.IMC;
import com.github.bartimaeusnek.bartworks.API.WerkstoffAdderRegistry;
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+
import cpw.mods.fml.common.Mod;
import cpw.mods.fml.common.Mod.EventHandler;
import cpw.mods.fml.common.SidedProxy;
@@ -18,9 +24,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent;
import cpw.mods.fml.common.event.FMLPreInitializationEvent;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_Log;
-import java.util.Arrays;
-import java.util.logging.Logger;
-import net.minecraftforge.oredict.OreDictionary;
@Mod(
modid = Tags.MODID,
@@ -73,9 +76,10 @@ public class GTNHLanthanides {
GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffNameHashMap.keySet().toArray()));
GT_Log.out.print(Arrays.toString(Werkstoff.werkstoffHashMap.keySet().toArray()));
- GT_Log.out.print("HMMM "
- + Arrays.toString(OreDictionary.getOreIDs(
- WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
+ GT_Log.out.print(
+ "HMMM " + Arrays.toString(
+ OreDictionary.getOreIDs(
+ WerkstoffMaterialPool.DephosphatedSamariumConcentrate.get(OrePrefixes.dust, 1))));
}
@EventHandler
diff --git a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
index db2f43e2c6..4420975173 100644
--- a/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
+++ b/src/main/java/com/elisis/gtnhlanth/client/ClientProxy.java
@@ -2,4 +2,5 @@ package com.elisis.gtnhlanth.client;
import com.elisis.gtnhlanth.common.CommonProxy;
-public class ClientProxy extends CommonProxy {}
+public class ClientProxy extends CommonProxy {
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
index 60d76c4cd8..77f33d2a61 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/BotWerkstoffMaterialPool.java
@@ -5,23 +5,22 @@ import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
import static gregtech.api.enums.Materials.*;
import static gregtech.api.enums.TextureSet.*;
+import net.minecraft.util.EnumChatFormatting;
+
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import com.github.bartimaeusnek.bartworks.util.Pair;
-import net.minecraft.util.EnumChatFormatting;
/*
- *
* Originally authored by botn365 under the MIT License. See BotdustriesLICENSE
- *
*/
@SuppressWarnings("unchecked")
public class BotWerkstoffMaterialPool implements Runnable {
- private static final String DEPRECATED =
- EnumChatFormatting.DARK_RED + "Deprecated; Will be removed in the next update";
+ private static final String DEPRECATED = EnumChatFormatting.DARK_RED
+ + "Deprecated; Will be removed in the next update";
public static final Werkstoff TungsticAcid = new Werkstoff(
- new short[] {0xf5, 0xf1, 0x16},
+ new short[] { 0xf5, 0xf1, 0x16 },
"Tungstic Acid",
new Werkstoff.Stats(),
COMPOUND,
@@ -32,7 +31,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
new Pair<>(Tungsten, 1),
new Pair<>(Oxygen, 4));
public static final Werkstoff TungstenTrioxide = new Werkstoff(
- new short[] {0x0f, 0x5, 0x16},
+ new short[] { 0x0f, 0x5, 0x16 },
"Tungsten Trioxide",
new Werkstoff.Stats(),
COMPOUND,
@@ -41,20 +40,20 @@ public class BotWerkstoffMaterialPool implements Runnable {
SET_SHINY,
new Pair<>(Tungsten, 1),
new Pair<>(Oxygen, 3));
- // public static final Werkstoff TungstenSteelOxide = new Werkstoff(
- // new short[]{0x1f,0x27,0x69},
- // "Tungstensteel Oxide",
- // new Werkstoff.Stats(),
- // COMPOUND,
- // new Werkstoff.GenerationFeatures().onlyDust(),
- // 29902,
- // SET_FINE,
- // new Pair<>(Tungsten, 1),
- // new Pair<>(Oxygen,3),
- // new Pair<>(Steel,1)
- // );
+ // public static final Werkstoff TungstenSteelOxide = new Werkstoff(
+ // new short[]{0x1f,0x27,0x69},
+ // "Tungstensteel Oxide",
+ // new Werkstoff.Stats(),
+ // COMPOUND,
+ // new Werkstoff.GenerationFeatures().onlyDust(),
+ // 29902,
+ // SET_FINE,
+ // new Pair<>(Tungsten, 1),
+ // new Pair<>(Oxygen,3),
+ // new Pair<>(Steel,1)
+ // );
public static final Werkstoff AmmoniumNitrate = new Werkstoff(
- new short[] {0x81, 0xcc, 0x00},
+ new short[] { 0x81, 0xcc, 0x00 },
"Ammonium Nitrate",
new Werkstoff.Stats(),
COMPOUND,
@@ -66,7 +65,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
new Pair<>(Nitrogen, 1),
new Pair<>(Oxygen, 3));
public static final Werkstoff SodiumTungstate = new Werkstoff(
- new short[] {0xc, 0xed, 0xd7, 0},
+ new short[] { 0xc, 0xed, 0xd7, 0 },
"Sodium Tungstate",
subscriptNumbers("Na2WO4"),
new Werkstoff.Stats(),
@@ -75,7 +74,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29904,
SET_FINE);
public static final Werkstoff Phosgene = new Werkstoff(
- new short[] {0x15, 0xa1, 0x1a},
+ new short[] { 0x15, 0xa1, 0x1a },
"Phosgene",
subscriptNumbers("COCl2"),
new Werkstoff.Stats(),
@@ -84,7 +83,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29905,
SET_FINE);
public static final Werkstoff Ethylchloroformate = new Werkstoff(
- new short[] {0x0a, 0xc2, 0xcc},
+ new short[] { 0x0a, 0xc2, 0xcc },
"Ethyl Chloroformate",
subscriptNumbers("C3H5ClO2"),
new Werkstoff.Stats(),
@@ -93,7 +92,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29906,
SET_FINE);
public static final Werkstoff Ethylcarbamate = new Werkstoff(
- new short[] {0x0d, 0xa9, 0xb8},
+ new short[] { 0x0d, 0xa9, 0xb8 },
"Ethyl Carbamate",
subscriptNumbers("CH3CH2O2CNH2"),
new Werkstoff.Stats(),
@@ -102,7 +101,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29907,
SET_FINE);
public static final Werkstoff EthylNnitrocarbamate = new Werkstoff(
- new short[] {0x0d, 0x85, 0xb8},
+ new short[] { 0x0d, 0x85, 0xb8 },
"Ethyl N-nitrocarbamate",
subscriptNumbers("C3H6N2O4"),
new Werkstoff.Stats(),
@@ -111,7 +110,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29908,
SET_FINE);
public static final Werkstoff AmmoniumNnitrourethane = new Werkstoff(
- new short[] {0x0d, 0x54, 0xb8},
+ new short[] { 0x0d, 0x54, 0xb8 },
"Ammonium N-nitrourethane",
subscriptNumbers("C3H9N3O4"),
new Werkstoff.Stats(),
@@ -120,7 +119,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29909,
SET_FINE);
public static final Werkstoff EthylDinitrocarbamate = new Werkstoff(
- new short[] {0x39, 0x08, 0xc2},
+ new short[] { 0x39, 0x08, 0xc2 },
"Ethyl Dinitrocarbamate",
subscriptNumbers("C3H5N3O6"),
new Werkstoff.Stats(),
@@ -129,7 +128,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29910,
SET_FINE);
public static final Werkstoff DinitrogenPentoxide = new Werkstoff(
- new short[] {0xcf, 0xeb, 0x34},
+ new short[] { 0xcf, 0xeb, 0x34 },
"Dinitrogen Pentoxide",
subscriptNumbers("N2O5"),
new Werkstoff.Stats(),
@@ -138,7 +137,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29911,
SET_FINE);
public static final Werkstoff AmmoniumDinitramide = new Werkstoff(
- new short[] {0x8a, 0x0f, 0xd1},
+ new short[] { 0x8a, 0x0f, 0xd1 },
"Ammonium Dinitramide",
subscriptNumbers("H4N4O4"),
new Werkstoff.Stats(),
@@ -147,7 +146,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29912,
SET_FINE);
public static final Werkstoff LMP103S = new Werkstoff(
- new short[] {0xbf, 0x2f, 0xc2},
+ new short[] { 0xbf, 0x2f, 0xc2 },
"LMP-103S",
DEPRECATED,
new Werkstoff.Stats(),
@@ -156,7 +155,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29913,
SET_FINE);
public static final Werkstoff OXylene = new Werkstoff(
- new short[] {0x88, 0x94, 0xa8},
+ new short[] { 0x88, 0x94, 0xa8 },
"O-Xylene",
subscriptNumbers("C8H10"),
new Werkstoff.Stats().setGas(true),
@@ -165,7 +164,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29915,
SET_FINE);
public static final Werkstoff PhthalicAnhydride = new Werkstoff(
- new short[] {0x7c, 0x99, 0x42},
+ new short[] { 0x7c, 0x99, 0x42 },
"Phthalic Anhydride",
subscriptNumbers("C8H4O3"),
new Werkstoff.Stats(),
@@ -174,7 +173,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29916,
SET_METALLIC);
public static final Werkstoff VanadiumPentoxide = new Werkstoff(
- new short[] {0x69, 0x69, 0x69},
+ new short[] { 0x69, 0x69, 0x69 },
"Vanadium Pentoxide",
subscriptNumbers("V2O5"),
new Werkstoff.Stats(),
@@ -183,7 +182,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29917,
SET_METALLIC);
public static final Werkstoff TertButylbenzene = new Werkstoff(
- new short[] {0, 0, 0},
+ new short[] { 0, 0, 0 },
"Tert-Butylbenzene",
subscriptNumbers("C10H14"),
new Werkstoff.Stats(),
@@ -192,7 +191,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29918,
SET_METALLIC);
public static final Werkstoff TwoTertButylAnthraquinone = new Werkstoff(
- new short[] {0xcc, 0x86, 0x5a},
+ new short[] { 0xcc, 0x86, 0x5a },
"2-tert-butyl-anthraquinone",
subscriptNumbers("C18H16O2"),
new Werkstoff.Stats(),
@@ -201,7 +200,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29919,
SET_METALLIC);
public static final Werkstoff TwoTertButylAnthrahydroquinone = new Werkstoff(
- new short[] {0xad, 0x53, 0x1a},
+ new short[] { 0xad, 0x53, 0x1a },
"2-tert-butyl-anthrahydroquinone",
subscriptNumbers("C18H17O2"),
new Werkstoff.Stats(),
@@ -210,7 +209,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29920,
SET_METALLIC);
public static final Werkstoff HydrogenPeroxide = new Werkstoff(
- new short[] {0xad, 0x53, 0x1a},
+ new short[] { 0xad, 0x53, 0x1a },
"Hydrogen Peroxide",
subscriptNumbers("H2O2"),
new Werkstoff.Stats(),
@@ -219,7 +218,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29921,
SET_METALLIC);
public static final Werkstoff Hydrazine = new Werkstoff(
- new short[] {0xb5, 0x07, 0x07},
+ new short[] { 0xb5, 0x07, 0x07 },
"hydrazine",
subscriptNumbers("N2H4"),
new Werkstoff.Stats(),
@@ -228,7 +227,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29922,
SET_METALLIC);
public static final Werkstoff DimethylSulfate = new Werkstoff(
- new short[] {0xff, 0xfb, 0x00},
+ new short[] { 0xff, 0xfb, 0x00 },
"Dimethyl Sulfate",
subscriptNumbers("(CH3O)2SO2"),
new Werkstoff.Stats(),
@@ -237,7 +236,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29923,
SET_METALLIC);
public static final Werkstoff Monomethylhydrazine = new Werkstoff(
- new short[] {0xff, 0x61, 0x00},
+ new short[] { 0xff, 0x61, 0x00 },
"Monomethylhydrazine",
subscriptNumbers("CH6N2"),
new Werkstoff.Stats(),
@@ -246,7 +245,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29924,
SET_METALLIC);
public static final Werkstoff Formaldehyde = new Werkstoff(
- new short[] {0x2e, 0xd9, 0x83},
+ new short[] { 0x2e, 0xd9, 0x83 },
"Formaldehyde",
subscriptNumbers("CH2O"),
new Werkstoff.Stats(),
@@ -255,7 +254,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29925,
SET_METALLIC);
public static final Werkstoff EthylAcetate = new Werkstoff(
- new short[] {0x0c, 0xfb, 0x32b},
+ new short[] { 0x0c, 0xfb, 0x32b },
"Ethyl Acetate",
subscriptNumbers("C4H8O2"),
new Werkstoff.Stats(),
@@ -264,7 +263,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29926,
SET_METALLIC);
public static final Werkstoff Acetylhydrazine = new Werkstoff(
- new short[] {0xd1, 0x5c, 0x5c},
+ new short[] { 0xd1, 0x5c, 0x5c },
"Acetylhydrazine",
subscriptNumbers("C2H6N2O"),
new Werkstoff.Stats(),
@@ -273,7 +272,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29927,
SET_METALLIC);
public static final Werkstoff UnsymmetricalDimethylhydrazine = new Werkstoff(
- new short[] {0x80, 0x06, 0x00},
+ new short[] { 0x80, 0x06, 0x00 },
"Unsymmetrical Dimethylhydrazine",
subscriptNumbers("H2NN(CH3)2"),
new Werkstoff.Stats(),
@@ -282,7 +281,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29928,
SET_METALLIC);
public static final Werkstoff MonomethylhydrazineFuelMix = new Werkstoff(
- new short[] {0x78, 0xe3, 0xa7},
+ new short[] { 0x78, 0xe3, 0xa7 },
"Monomethylhydrazine Fuel Mix",
DEPRECATED,
new Werkstoff.Stats(),
@@ -291,7 +290,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29929,
SET_METALLIC);
public static final Werkstoff UnsymmetricalDimethylhydrazineFuelMix = new Werkstoff(
- new short[] {0xc8, 0xff, 0x00},
+ new short[] { 0xc8, 0xff, 0x00 },
"Unsymmetrical Dimethylhydrazine Fuel Mix",
DEPRECATED,
new Werkstoff.Stats(),
@@ -300,7 +299,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29930,
SET_METALLIC);
public static final Werkstoff Nitromethane = new Werkstoff(
- new short[] {0x87, 0x7d, 0x60},
+ new short[] { 0x87, 0x7d, 0x60 },
"Nitromethane",
subscriptNumbers("CH3NO2"),
new Werkstoff.Stats(),
@@ -309,7 +308,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29914,
SET_METALLIC);
public static final Werkstoff BoronTrioxide = new Werkstoff(
- new short[] {0xe3, 0xa6, 0xd3},
+ new short[] { 0xe3, 0xa6, 0xd3 },
"Boron Trioxide",
subscriptNumbers("B2O3"),
new Werkstoff.Stats(),
@@ -318,7 +317,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29931,
SET_METALLIC);
public static final Werkstoff BoronTrifluoride = new Werkstoff(
- new short[] {0xd0, 0xe0, 0x3f},
+ new short[] { 0xd0, 0xe0, 0x3f },
"Boron Trifluoride",
subscriptNumbers("BF3"),
new Werkstoff.Stats().setGas(true),
@@ -327,7 +326,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29932,
SET_METALLIC);
public static final Werkstoff NitroniumTetrafluoroborate = new Werkstoff(
- new short[] {0x57, 0x69, 0x2d},
+ new short[] { 0x57, 0x69, 0x2d },
"Nitronium Tetrafluoroborate",
subscriptNumbers("NO2BF4"),
new Werkstoff.Stats(),
@@ -336,7 +335,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29933,
SET_METALLIC);
public static final Werkstoff Trinitramid = new Werkstoff(
- new short[] {0x28, 0x2b, 0x70},
+ new short[] { 0x28, 0x2b, 0x70 },
"Trinitramid",
subscriptNumbers("N4O6"),
new Werkstoff.Stats().setGas(true),
@@ -345,7 +344,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29934,
SET_METALLIC);
public static final Werkstoff AmmoniaBoronfluorideSolution = new Werkstoff(
- new short[] {0x28, 0x2b, 0x70},
+ new short[] { 0x28, 0x2b, 0x70 },
"Ammonia Boronfluoride Solution",
subscriptNumbers("NH4BF4"),
new Werkstoff.Stats(),
@@ -354,7 +353,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29935,
SET_METALLIC);
public static final Werkstoff SodiumTetrafluoroborate = new Werkstoff(
- new short[] {0xbe, 0x6e, 0xe0},
+ new short[] { 0xbe, 0x6e, 0xe0 },
"Sodium Tetrafluoroborate",
subscriptNumbers("NaBF4"),
new Werkstoff.Stats(),
@@ -363,7 +362,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29936,
SET_METALLIC);
public static final Werkstoff SodiumFluoride = new Werkstoff(
- new short[] {0x9f, 0x70, 0xe6},
+ new short[] { 0x9f, 0x70, 0xe6 },
"Sodium Fluoride",
subscriptNumbers("NaF"),
new Werkstoff.Stats(),
@@ -372,7 +371,7 @@ public class BotWerkstoffMaterialPool implements Runnable {
29937,
SET_METALLIC);
public static final Werkstoff Tetrafluoroborate = new Werkstoff(
- new short[] {0x6a, 0x53, 0x8c},
+ new short[] { 0x6a, 0x53, 0x8c },
"Tetrafluoroboric Acid",
subscriptNumbers("HBF4"),
new Werkstoff.Stats().setGas(true),
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
index abed46df99..a3668b5aeb 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/LanthItemList.java
@@ -1,8 +1,9 @@
package com.elisis.gtnhlanth.common.register;
+import net.minecraft.item.ItemStack;
+
import com.elisis.gtnhlanth.common.tileentity.Digester;
import com.elisis.gtnhlanth.common.tileentity.DissolutionTank;
-import net.minecraft.item.ItemStack;
public final class LanthItemList {
@@ -12,7 +13,7 @@ public final class LanthItemList {
public static void register() {
LanthItemList.DIGESTER = new Digester(10500, "Digester", "Digester").getStackForm(1L);
- LanthItemList.DISSOLUTION_TANK =
- new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank").getStackForm(1L);
+ LanthItemList.DISSOLUTION_TANK = new DissolutionTank(10501, "Dissolution Tank", "Dissolution Tank")
+ .getStackForm(1L);
}
}
diff --git a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
index d26cb932f5..a3f6e488b9 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/register/WerkstoffMaterialPool.java
@@ -2,13 +2,15 @@ package com.elisis.gtnhlanth.common.register;
import static com.github.bartimaeusnek.bartworks.util.BW_Util.subscriptNumbers;
+import java.util.Arrays;
+
import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
import com.github.bartimaeusnek.bartworks.util.Pair;
+
import gregtech.api.enums.Materials;
import gregtech.api.enums.TextureSet;
-import java.util.Arrays;
-@SuppressWarnings({"unchecked"})
+@SuppressWarnings({ "unchecked" })
public class WerkstoffMaterialPool implements Runnable {
private static final int offsetID = 11_000;
@@ -16,58 +18,50 @@ public class WerkstoffMaterialPool implements Runnable {
private static final int offsetID3 = 11_300;
/*
- * public static final Werkstoff __ = new Werkstoff(
- new short[] {_, _, _},
- "__",
- new Werkstoff.Stats(),
- Werkstoff.Types.MIXTURE,
- new Werkstoff.GenerationFeatures().disable(),
- offsetID_,
- TextureSet.SET_DULL
- );
- */
+ * public static final Werkstoff __ = new Werkstoff( new short[] {_, _, _}, "__", new Werkstoff.Stats(),
+ * Werkstoff.Types.MIXTURE, new Werkstoff.GenerationFeatures().disable(), offsetID_, TextureSet.SET_DULL );
+ */
// Misc.
public static final Werkstoff Hafnium = new Werkstoff(
- new short[] {232, 224, 219},
+ new short[] { 232, 224, 219 },
"Hafnium",
subscriptNumbers("Hf"),
new Werkstoff.Stats(),
Werkstoff.Types.ELEMENT,
- new Werkstoff.GenerationFeatures()
- .disable()
- .onlyDust()
- .addMetalItems()
- .enforceUnification(), // Perhaps use hafnia liquid in elemental hafnium synthesis
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(), // Perhaps use
+ // hafnia
+ // liquid in
+ // elemental
+ // hafnium
+ // synthesis
offsetID,
TextureSet.SET_DULL);
public static final Werkstoff LowPurityHafnium = new Werkstoff(
- new short[] {240, 223, 208},
+ new short[] { 240, 223, 208 },
"Low-Purity Hafnium",
subscriptNumbers("??Hf??"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures()
- .disable()
- .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis
+ new Werkstoff.GenerationFeatures().disable().onlyDust(), // Perhaps use hafnia liquid in elemental hafnium
+ // synthesis
offsetID + 1,
TextureSet.SET_DULL);
public static final Werkstoff Hafnia = new Werkstoff(
- new short[] {247, 223, 203},
+ new short[] { 247, 223, 203 },
"Hafnia",
subscriptNumbers("HfO2"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures()
- .disable()
- .onlyDust(), // Perhaps use hafnia liquid in elemental hafnium synthesis
+ new Werkstoff.GenerationFeatures().disable().onlyDust(), // Perhaps use hafnia liquid in elemental hafnium
+ // synthesis
offsetID + 2,
TextureSet.SET_DULL);
public static final Werkstoff HafniumTetrachloride = new Werkstoff(
- new short[] {238, 247, 249},
+ new short[] { 238, 247, 249 },
"Hafnium Tetrachloride",
subscriptNumbers("HfCl4"),
new Werkstoff.Stats(),
@@ -77,7 +71,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff HafniumTetrachlorideSolution = new Werkstoff(
- new short[] {238, 247, 249},
+ new short[] { 238, 247, 249 },
"Hafnium Tetrachloride Solution",
subscriptNumbers("HfCl4"),
new Werkstoff.Stats(),
@@ -87,7 +81,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff HafniumIodide = new Werkstoff(
- new short[] {216, 60, 1},
+ new short[] { 216, 60, 1 },
"Hafnium Iodide",
subscriptNumbers("HfI4"),
new Werkstoff.Stats(),
@@ -97,7 +91,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff HafniumRunoff = new Werkstoff(
- new short[] {74, 65, 42}, // Literally the statistically ugliest colour
+ new short[] { 74, 65, 42 }, // Literally the statistically ugliest colour
"Hafnium Runoff",
subscriptNumbers("??????"),
new Werkstoff.Stats(),
@@ -107,21 +101,17 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff Zirconium = new Werkstoff(
- new short[] {225, 230, 225},
+ new short[] { 225, 230, 225 },
"Zirconium",
subscriptNumbers("Zr"),
new Werkstoff.Stats().setBlastFurnace(true),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures()
- .disable()
- .onlyDust()
- .addMetalItems()
- .enforceUnification(),
+ new Werkstoff.GenerationFeatures().disable().onlyDust().addMetalItems().enforceUnification(),
offsetID + 7,
TextureSet.SET_DULL);
public static final Werkstoff Zirconia = new Werkstoff(
- new short[] {177, 152, 101},
+ new short[] { 177, 152, 101 },
"Zirconia",
subscriptNumbers("ZrO2"),
new Werkstoff.Stats(),
@@ -131,7 +121,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff ZirconiumTetrachloride = new Werkstoff(
- new short[] {179, 164, 151},
+ new short[] { 179, 164, 151 },
"Zirconium Tetrachloride",
subscriptNumbers("ZrCl4"),
new Werkstoff.Stats(),
@@ -141,20 +131,19 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff ZirconiumTetrachlorideSolution = new Werkstoff(
- new short[] {179, 164, 151},
+ new short[] { 179, 164, 151 },
"Zirconium Tetrachloride Solution",
subscriptNumbers("ZrCl4"),
new Werkstoff.Stats(),
Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures()
- .disable()
- .addCells(), // Blast Furnace needs liquid input because it can't do 3 item inputs so have a shitty
+ new Werkstoff.GenerationFeatures().disable().addCells(), // Blast Furnace needs liquid input because it
+ // can't do 3 item inputs so have a shitty
// material
offsetID + 10,
TextureSet.SET_FLUID);
public static final Werkstoff HafniaZirconiaBlend = new Werkstoff(
- new short[] {247, 223, 203},
+ new short[] { 247, 223, 203 },
"Hafnia-Zirconia Blend", // Maybe Hafnon??
subscriptNumbers("??HfZr??"),
new Werkstoff.Stats(),
@@ -164,15 +153,10 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff Iodine = new Werkstoff(
- new short[] {171, 40, 175},
+ new short[] { 171, 40, 175 },
"Iodine",
subscriptNumbers("I"),
- new Werkstoff.Stats()
- .setProtons(53)
- .setMass(127)
- .setSublimation(true)
- .setBoilingPoint(484)
- .setGas(true),
+ new Werkstoff.Stats().setProtons(53).setMass(127).setSublimation(true).setBoilingPoint(484).setGas(true),
Werkstoff.Types.ELEMENT,
new Werkstoff.GenerationFeatures().disable().onlyDust().addCells().enforceUnification(),
offsetID + 12,
@@ -180,7 +164,7 @@ public class WerkstoffMaterialPool implements Runnable {
// Lanthanide Line
public static final Werkstoff MuddyRareEarthMonaziteSolution = new Werkstoff(
- new short[] {111, 78, 55},
+ new short[] { 111, 78, 55 },
"Muddy Monazite Rare Earth Solution",
subscriptNumbers("??LaNdZr??"),
new Werkstoff.Stats(),
@@ -190,7 +174,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff DilutedRareEarthMonaziteMud = new Werkstoff(
- new short[] {160, 120, 90},
+ new short[] { 160, 120, 90 },
"Diluted Monazite Rare Earth Mud",
subscriptNumbers("??LaNdHf??"),
new Werkstoff.Stats(),
@@ -200,7 +184,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff DilutedMonaziteSulfate = new Werkstoff(
- new short[] {237, 201, 175},
+ new short[] { 237, 201, 175 },
"Diluted Monazite Sulfate",
subscriptNumbers("??LaNd??"),
new Werkstoff.Stats(),
@@ -210,7 +194,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff NitratedRareEarthMonaziteConcentrate = new Werkstoff(
- new short[] {250, 223, 173},
+ new short[] { 250, 223, 173 },
"Nitrogenated Monazite Rare Earth Concentrate",
subscriptNumbers("??LaNd??"),
new Werkstoff.Stats(),
@@ -220,7 +204,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff NitricMonaziteLeachedConcentrate = new Werkstoff(
- new short[] {244, 202, 22},
+ new short[] { 244, 202, 22 },
"Nitric Monazite Leached Concentrate",
subscriptNumbers("??LaNd??"),
new Werkstoff.Stats(),
@@ -230,7 +214,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff MonaziteSulfate = new Werkstoff(
- new short[] {152, 118, 84},
+ new short[] { 152, 118, 84 },
"Monazite Sulfate",
subscriptNumbers("??CeEu??"),
new Werkstoff.Stats(),
@@ -240,7 +224,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff AcidicMonazitePowder = new Werkstoff(
- new short[] {50, 23, 77},
+ new short[] { 50, 23, 77 },
"Acidic Monazite Powder",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -250,7 +234,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MonaziteRareEarthFiltrate = new Werkstoff(
- new short[] {72, 60, 50},
+ new short[] { 72, 60, 50 },
"Monazite Rare Earth Filtrate",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -260,7 +244,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff NeutralizedMonaziteRareEarthFiltrate = new Werkstoff(
- new short[] {50, 23, 77},
+ new short[] { 50, 23, 77 },
"Neutralized Monazite Rare Earth Filtrate",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -270,7 +254,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MonaziteRareEarthHydroxideConcentrate = new Werkstoff(
- new short[] {193, 154, 107},
+ new short[] { 193, 154, 107 },
"Monazite Rare Earth Hydroxide Concentrate",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -280,7 +264,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff DriedMonaziteRareEarthConcentrate = new Werkstoff(
- new short[] {250, 214, 165},
+ new short[] { 250, 214, 165 },
"Dried Monazite Rare Earth Concentrate",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -290,7 +274,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CeriumDioxide = new Werkstoff(
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
"Cerium Dioxide",
subscriptNumbers("CeO2"),
new Werkstoff.Stats(),
@@ -300,7 +284,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CeriumChloride = new Werkstoff(
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
"Cerium Chloride",
subscriptNumbers("CeCl3"),
new Werkstoff.Stats(),
@@ -310,7 +294,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CeriumOxalate = new Werkstoff(
- new short[] {255, 255, 224},
+ new short[] { 255, 255, 224 },
"Cerium Oxalate",
subscriptNumbers("Ce2(C2O4)3"),
new Werkstoff.Stats(),
@@ -320,7 +304,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CeriumIIIOxide = new Werkstoff(
- new short[] {255, 255, 102},
+ new short[] { 255, 255, 102 },
"Cerium (III) Oxide",
subscriptNumbers("Ce2O3"),
new Werkstoff.Stats().setElektrolysis(true),
@@ -333,7 +317,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Pair<>(Materials.Oxygen, 3));
public static final Werkstoff CeriumRichMixture = new Werkstoff(
- new short[] {244, 164, 96},
+ new short[] { 244, 164, 96 },
"Cerium-Rich Mixture",
subscriptNumbers("??Ce??"),
new Werkstoff.Stats(),
@@ -343,7 +327,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CooledMonaziteRareEarthConcentrate = new Werkstoff(
- new short[] {250, 214, 165},
+ new short[] { 250, 214, 165 },
"Cooled Monazite Rare Earth Concentrate",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -353,7 +337,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MonaziteRarerEarthSediment = new Werkstoff(
- new short[] {250, 214, 165},
+ new short[] { 250, 214, 165 },
"MonaziteRarer Earth Sediment",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -363,7 +347,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MonaziteHeterogenousHalogenicRareEarthMixture = new Werkstoff(
- new short[] {250, 214, 165},
+ new short[] { 250, 214, 165 },
"Heterogenous Halogenic Monazite Rare Earth Mixture",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -373,7 +357,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff SaturatedMonaziteRareEarthMixture = new Werkstoff(
- new short[] {250, 214, 165},
+ new short[] { 250, 214, 165 },
"Saturated Monazite Rare Earth",
subscriptNumbers("????"),
new Werkstoff.Stats(),
@@ -383,7 +367,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff SamaricResidue = new Werkstoff(
- new short[] {248, 243, 231},
+ new short[] { 248, 243, 231 },
"Samaric Residue",
subscriptNumbers("??SmGd??"),
new Werkstoff.Stats(),
@@ -393,7 +377,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MonaziteResidue = new Werkstoff(
- new short[] {64, 69, 62},
+ new short[] { 64, 69, 62 },
"Monazite Residue",
subscriptNumbers("??ZrHfTh??"),
new Werkstoff.Stats(),
@@ -403,7 +387,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff AmmoniumNitrate = new Werkstoff(
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
"Ammonium Nitrate Solution",
subscriptNumbers("NH4NO3"),
new Werkstoff.Stats(),
@@ -413,7 +397,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff ThoriumPhosphateCake = new Werkstoff(
- new short[] {188, 143, 143},
+ new short[] { 188, 143, 143 },
"Thorium-Phosphate Cake",
subscriptNumbers("??ThP??"),
new Werkstoff.Stats(),
@@ -423,7 +407,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff ThoriumPhosphateConcentrate = new Werkstoff(
- new short[] {217, 144, 88},
+ new short[] { 217, 144, 88 },
"Thorium-Phosphate Concentrate",
subscriptNumbers("??ThP??"),
new Werkstoff.Stats(),
@@ -433,7 +417,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff UraniumFiltrate = new Werkstoff(
- new short[] {190, 240, 94},
+ new short[] { 190, 240, 94 },
"UraniumFiltrate",
subscriptNumbers("??U??"),
new Werkstoff.Stats(),
@@ -443,7 +427,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff NeutralizedUraniumFiltrate = new Werkstoff(
- new short[] {217, 120, 88},
+ new short[] { 217, 120, 88 },
"Neutralized Uranium Filtrate",
subscriptNumbers("??U??"),
new Werkstoff.Stats(),
@@ -453,7 +437,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff SeaweedAsh = new Werkstoff(
- new short[] {70, 75, 71},
+ new short[] { 70, 75, 71 },
"Seaweed Ash",
new Werkstoff.Stats(),
Werkstoff.Types.BIOLOGICAL,
@@ -462,7 +446,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff SeaweedConcentrate = new Werkstoff(
- new short[] {70, 100, 71},
+ new short[] { 70, 100, 71 },
"Seaweed Concentrate",
subscriptNumbers("??I??"),
new Werkstoff.Stats(),
@@ -472,7 +456,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff PotassiumPermanganate = new Werkstoff(
- new short[] {165, 50, 138},
+ new short[] { 165, 50, 138 },
"Potassium Permanganate",
subscriptNumbers("KMnO4"),
new Werkstoff.Stats(),
@@ -482,7 +466,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff PotassiumPermanganateSolution = new Werkstoff(
- new short[] {165, 50, 138},
+ new short[] { 165, 50, 138 },
"Potassium Permanganate Solution",
subscriptNumbers("KMnO4"),
new Werkstoff.Stats(),
@@ -492,7 +476,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff SeaweedByproducts = new Werkstoff(
- new short[] {125, 50, 138},
+ new short[] { 125, 50, 138 },
"Seaweed Byproducts",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -501,7 +485,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff NitricLeachedMonaziteMixture = new Werkstoff(
- new short[] {125, 50, 138},
+ new short[] { 125, 50, 138 },
"Nitric-Leached Monazite Mixture",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -510,7 +494,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff EuropiumOxide = new Werkstoff(
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
"Europium Oxide",
subscriptNumbers("EuO"),
new Werkstoff.Stats(),
@@ -520,7 +504,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff EuropiumSulfide = new Werkstoff(
- new short[] {5, 0, 5},
+ new short[] { 5, 0, 5 },
"Europium Sulfide",
subscriptNumbers("EuS"),
new Werkstoff.Stats(),
@@ -530,7 +514,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff UnknownBlend = new Werkstoff(
- new short[] {0, 0, 5},
+ new short[] { 0, 0, 5 },
"UnknownBlend",
subscriptNumbers("?????"),
new Werkstoff.Stats(),
@@ -543,7 +527,7 @@ public class WerkstoffMaterialPool implements Runnable {
// BASTNASITE
public static final Werkstoff MuddyRareEarthBastnasiteSolution = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Muddy Bastnasite Rare Earth Solution",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -552,19 +536,12 @@ public class WerkstoffMaterialPool implements Runnable {
offsetID2,
TextureSet.SET_FLUID);
/*
- public static final Werkstoff FluorosilicicAcid = new Werkstoff(
- new short[] {205, 133, 63},
- "Hexafluorosilicic Acid",
- subscriptNumbers("H2SiF6"),
- new Werkstoff.Stats(),
- Werkstoff.Types.COMPOUND,
- new Werkstoff.GenerationFeatures().disable().addCells(),
- offsetID2 + 1,
- TextureSet.SET_FLUID
- );
- */
+ * public static final Werkstoff FluorosilicicAcid = new Werkstoff( new short[] {205, 133, 63},
+ * "Hexafluorosilicic Acid", subscriptNumbers("H2SiF6"), new Werkstoff.Stats(), Werkstoff.Types.COMPOUND, new
+ * Werkstoff.GenerationFeatures().disable().addCells(), offsetID2 + 1, TextureSet.SET_FLUID );
+ */
public static final Werkstoff SodiumFluorosilicate = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Sodiumfluorosilicate",
subscriptNumbers("Na2SiF6"),
new Werkstoff.Stats(),
@@ -574,7 +551,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff SteamCrackedBasnasiteSolution = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Steam-Cracked Bastnasite Mud",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -584,7 +561,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff ConditionedBastnasiteMud = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Conditioned Bastnasite Mud",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -594,7 +571,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff DiltedRareEarthBastnasiteMud = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Diluted Bastnasite Mud",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -604,7 +581,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff FilteredBastnasiteMud = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Filtered Bastnasite Mud",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -614,7 +591,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff BastnasiteRareEarthOxidePowder = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Bastnasite Rare Earth Oxides",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -624,7 +601,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff LeachedBastnasiteRareEarthOxides = new Werkstoff(
- new short[] {205, 133, 63},
+ new short[] { 205, 133, 63 },
"Acid-Leached Bastnasite Rare Earth Oxides",
subscriptNumbers("??LaCeY??"),
new Werkstoff.Stats(),
@@ -634,7 +611,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff Gangue = new Werkstoff(
- new short[] {0, 0, 0},
+ new short[] { 0, 0, 0 },
"Gangue",
subscriptNumbers("Useless..."),
new Werkstoff.Stats(),
@@ -644,7 +621,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
// TODO: Deal with colouring
public static final Werkstoff RoastedRareEarthOxides = new Werkstoff(
- new short[] {160, 82, 45},
+ new short[] { 160, 82, 45 },
"Roasted Rare Earth Oxides",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -653,7 +630,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff WetRareEarthOxides = new Werkstoff(
- new short[] {160, 82, 49},
+ new short[] { 160, 82, 49 },
"Wet Rare Earth Oxides",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -662,7 +639,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CeriumOxidisedRareEarthOxides = new Werkstoff(
- new short[] {160, 82, 49},
+ new short[] { 160, 82, 49 },
"Cerium-Oxidised Rare Earth Oxides",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -671,7 +648,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff BastnasiteRarerEarthOxides = new Werkstoff(
- new short[] {160, 82, 49},
+ new short[] { 160, 82, 49 },
"Bastnasite Rarer Earth Oxides",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -680,7 +657,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff NitratedBastnasiteRarerEarthOxides = new Werkstoff(
- new short[] {160, 90, 60},
+ new short[] { 160, 90, 60 },
"Nitrogenated Bastnasite Rarer Earth Oxides",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -689,7 +666,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff SaturatedBastnasiteRarerEarthOxides = new Werkstoff(
- new short[] {170, 90, 60},
+ new short[] { 170, 90, 60 },
"Bastnasite Rarer Earth Oxide Suspension",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -698,7 +675,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff SamaricRareEarthConcentrate = new Werkstoff(
- new short[] {170, 90, 60},
+ new short[] { 170, 90, 60 },
"Samaric Rare Earth Concentrate",
subscriptNumbers("??SmHoTb??"),
new Werkstoff.Stats(),
@@ -708,7 +685,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff NeodymicRareEarthConcentrate = new Werkstoff(
- new short[] {170, 90, 60},
+ new short[] { 170, 90, 60 },
"Neodymium Rare Earth Concentrate",
subscriptNumbers("??LaNdPr??"),
new Werkstoff.Stats(),
@@ -718,7 +695,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff FluorinatedNeodymicRareEarths = new Werkstoff(
- new short[] {170, 90, 60},
+ new short[] { 170, 90, 60 },
"Fluorinated Neodymium Rare Earths",
subscriptNumbers("??LaNdPr??"),
new Werkstoff.Stats(),
@@ -728,7 +705,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff PraseodymiumTetrafluoride = new Werkstoff(
- new short[] {82, 112, 102},
+ new short[] { 82, 112, 102 },
"Praseodymium Tetrafluoride",
subscriptNumbers("PrF4"),
new Werkstoff.Stats().setElektrolysis(true),
@@ -741,7 +718,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Pair<>(Materials.Fluorine, 4));
public static final Werkstoff RareEarthTrifluorides = new Werkstoff(
- new short[] {82, 112, 102},
+ new short[] { 82, 112, 102 },
"Rare Earth Trifluorides",
subscriptNumbers("??LaNd??"),
new Werkstoff.Stats(),
@@ -751,7 +728,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff LanthaniumChloride = new Werkstoff(
- new short[] {82, 112, 102},
+ new short[] { 82, 112, 102 },
"Lanthanium Chloride",
subscriptNumbers("LaCl3"),
new Werkstoff.Stats().setElektrolysis(true),
@@ -764,7 +741,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Pair<>(Materials.Chlorine, 3));
public static final Werkstoff NeodymiumOxide = new Werkstoff(
- new short[] {82, 112, 102},
+ new short[] { 82, 112, 102 },
"Neodymium Oxide",
subscriptNumbers("Nd2O3"),
new Werkstoff.Stats().setElektrolysis(true),
@@ -777,7 +754,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Pair<>(Materials.Oxygen, 3));
public static final Werkstoff FluorinatedSamaricConcentrate = new Werkstoff(
- new short[] {255, 182, 193},
+ new short[] { 255, 182, 193 },
"Fluorinated Samaric Concentrate",
subscriptNumbers("??SmHo??"),
new Werkstoff.Stats(),
@@ -787,7 +764,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff CalciumFluoride = new Werkstoff(
- new short[] {255, 250, 250},
+ new short[] { 255, 250, 250 },
"Calcium Fluoride",
subscriptNumbers("CaF2"),
new Werkstoff.Stats().setElektrolysis(true),
@@ -800,7 +777,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Pair<>(Materials.Fluorine, 2));
public static final Werkstoff SamariumTerbiumMixture = new Werkstoff(
- new short[] {223, 182, 193},
+ new short[] { 223, 182, 193 },
"Samarium-Terbium Mixture",
subscriptNumbers("??SmTb??"),
new Werkstoff.Stats(),
@@ -810,7 +787,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff NitratedSamariumTerbiumMixture = new Werkstoff(
- new short[] {223, 182, 193},
+ new short[] { 223, 182, 193 },
"Nitrogenated Samarium-Terbium Mixture",
subscriptNumbers("??SmTb??NH4NO3"),
new Werkstoff.Stats(),
@@ -820,7 +797,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff TerbiumNitrate = new Werkstoff(
- new short[] {167, 252, 0},
+ new short[] { 167, 252, 0 },
"Terbium Nitrate",
subscriptNumbers("TbNO3"),
new Werkstoff.Stats().setElektrolysis(true),
@@ -834,7 +811,7 @@ public class WerkstoffMaterialPool implements Runnable {
new Pair<>(Materials.Oxygen, 3));
public static final Werkstoff SamariumOreConcentrate = new Werkstoff(
- new short[] {255, 200, 230},
+ new short[] { 255, 200, 230 },
"Samarium Ore Concentrate",
subscriptNumbers("??Sm??"),
new Werkstoff.Stats(),
@@ -844,7 +821,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff DephosphatedSamariumConcentrate = new Werkstoff(
- new short[] {255, 170, 220},
+ new short[] { 255, 170, 220 },
"Dephosphated Samarium Concentrate",
subscriptNumbers("??Sm??"),
new Werkstoff.Stats(),
@@ -855,7 +832,7 @@ public class WerkstoffMaterialPool implements Runnable {
// Weird/Exciting Chemicals
public static final Werkstoff Tetrahydrofuran = new Werkstoff(
- new short[] {222, 165, 164},
+ new short[] { 222, 165, 164 },
"Tetrahydrofuran",
subscriptNumbers("(CH2)4O"),
new Werkstoff.Stats(),
@@ -866,7 +843,7 @@ public class WerkstoffMaterialPool implements Runnable {
// 1,4-Butanediol
public static final Werkstoff Butanediol = new Werkstoff(
- new short[] {185, 78, 72},
+ new short[] { 185, 78, 72 },
"1,4-Butanediol",
subscriptNumbers("HO(CH2)4OH"),
new Werkstoff.Stats(),
@@ -877,7 +854,7 @@ public class WerkstoffMaterialPool implements Runnable {
// Acidicised 1,4-Butanediol
public static final Werkstoff AcidicButanediol = new Werkstoff(
- new short[] {255, 239, 213},
+ new short[] { 255, 239, 213 },
"Acidicised 1,4-Butanediol",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -887,7 +864,7 @@ public class WerkstoffMaterialPool implements Runnable {
// Tellurium-Molybdenum-Oxide Catalyst
public static final Werkstoff MoTeOCatalyst = new Werkstoff(
- new short[] {238, 131, 238},
+ new short[] { 238, 131, 238 },
"Tellurium-Molybdenum-Oxide Catalyst",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
@@ -897,7 +874,7 @@ public class WerkstoffMaterialPool implements Runnable {
// Tellurium Oxide
public static final Werkstoff TelluriumIVOxide = new Werkstoff(
- new short[] {229, 199, 187},
+ new short[] { 229, 199, 187 },
"Tellurium (IV) Oxide",
subscriptNumbers("TeO2"),
new Werkstoff.Stats(),
@@ -907,7 +884,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MolybdenumIVOxide = new Werkstoff(
- new short[] {52, 53, 57},
+ new short[] { 52, 53, 57 },
"Molybdenum (IV) Oxide",
subscriptNumbers("MoO2"),
new Werkstoff.Stats(),
@@ -917,7 +894,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff Polytetrahydrofuran = new Werkstoff(
- new short[] {192, 128, 129},
+ new short[] { 192, 128, 129 },
"Polytetrahydrofuran",
subscriptNumbers("(C4H8O)OH2"),
new Werkstoff.Stats(),
@@ -927,7 +904,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff TungstophosphoricAcid = new Werkstoff(
- new short[] {223, 255, 0},
+ new short[] { 223, 255, 0 },
"Tungstophosphoric Acid",
subscriptNumbers("H3PW12O40"),
new Werkstoff.Stats(),
@@ -937,7 +914,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff TolueneDiisocyanate = new Werkstoff(
- new short[] {255, 255, 102},
+ new short[] { 255, 255, 102 },
"Toluene Diisocyanate",
subscriptNumbers("CH3C6H3(NCO)2"),
new Werkstoff.Stats(),
@@ -947,7 +924,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff Dinitrotoluene = new Werkstoff(
- new short[] {216, 191, 216},
+ new short[] { 216, 191, 216 },
"Dinitrotoluene",
subscriptNumbers("C7H6N2O4"),
new Werkstoff.Stats(),
@@ -957,7 +934,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff Diaminotoluene = new Werkstoff(
- new short[] {227, 218, 201},
+ new short[] { 227, 218, 201 },
"Diaminotoluene",
subscriptNumbers("C6H3(NH2)2CH3"),
new Werkstoff.Stats(),
@@ -967,7 +944,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff TolueneTetramethylDiisocyanate = new Werkstoff(
- new short[] {255, 255, 255},
+ new short[] { 255, 255, 255 },
"Toluene Tetramethyl Diisocyanate",
subscriptNumbers("(CONH)2(C6H4)2CH2(C4O)"),
new Werkstoff.Stats(),
@@ -977,7 +954,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_FLUID);
public static final Werkstoff PTMEGElastomer = new Werkstoff(
- new short[] {248, 248, 255},
+ new short[] { 248, 248, 255 },
"PTMEG Elastomer",
new Werkstoff.Stats().setMeltingPoint(600).setMeltingVoltage(64),
Werkstoff.Types.COMPOUND,
@@ -986,7 +963,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MagnesiumPeroxide = new Werkstoff(
- new short[] {255, 250, 205},
+ new short[] { 255, 250, 205 },
"Magnesium Peroxide",
subscriptNumbers("MnO2"),
new Werkstoff.Stats(),
@@ -996,7 +973,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_METALLIC);
public static final Werkstoff PotassiumChlorate = new Werkstoff(
- new short[] {240, 255, 255},
+ new short[] { 240, 255, 255 },
"Potassium Chlorate",
subscriptNumbers("KClO3"),
new Werkstoff.Stats(),
@@ -1006,7 +983,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_DULL);
public static final Werkstoff MARM247 = new Werkstoff(
- new short[] {255, 133, 145},
+ new short[] { 255, 133, 145 },
"MAR-M247",
new Werkstoff.Stats().setMeltingPoint(8000).setBlastFurnace(true).setMeltingVoltage(7680),
Werkstoff.Types.COMPOUND,
@@ -1015,7 +992,7 @@ public class WerkstoffMaterialPool implements Runnable {
TextureSet.SET_METALLIC);
public static final Werkstoff DilutedAcetone = new Werkstoff(
- new short[] {254, 254, 250},
+ new short[] { 254, 254, 250 },
"Diluted Acetone",
new Werkstoff.Stats(),
Werkstoff.Types.MIXTURE,
diff --git a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
index 29abece11a..800b4f3129 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/Digester.java
@@ -12,11 +12,17 @@ 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 net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
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.interfaces.ITexture;
@@ -26,9 +32,6 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
-import java.util.ArrayList;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester> implements IConstructable {
@@ -37,13 +40,13 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
private HeatingCoilLevel heatLevel;
- private final 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 "},
- }))
+ private final 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(
@@ -55,8 +58,7 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
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();
+ .addElement('c', ofCoil(Digester::setCoilLevel, Digester::getCoilLevel)).build();
// private int mHeat;
// private int mNeededHeat;
@@ -99,8 +101,8 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
// GT_Log.out.print("Digester: " + Arrays.toString(mInventory));
// Collection<GT_Recipe> tRecipes = RecipeAdder.instance.DigesterRecipes.mRecipeList;
- GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes.findRecipe(
- getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
+ GT_Recipe tRecipe = RecipeAdder.instance.DigesterRecipes
+ .findRecipe(getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) return false;
// GT_Log.out.print("Recipe not null\n");
@@ -149,57 +151,32 @@ public class Digester extends GT_MetaTileEntity_EnhancedMultiBlockBase<Digester>
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, boolean redstone) {
+ 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()
- };
+ 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();
- tt.addMachineType("Digester")
- .addInfo("Controller block for the Digester")
- .addInfo("Input ores and fluid, output water.")
- .addInfo(BLUEPRINT_INFO)
- .addSeparator()
- .addController("Front bottom")
- .addInputHatch("Hint block with dot 1")
- .addInputBus("Hint block with dot 1")
- .addOutputHatch("Hint block with dot 1")
- .addOutputBus("Hint block with dot 1")
- .addMaintenanceHatch("Hint block with dot 1")
- .addMufflerHatch("Hint block with dot 1")
- .toolTipFinisher("GTNH: Lanthanides");
+ tt.addMachineType("Digester").addInfo("Controller block for the Digester")
+ .addInfo("Input ores and fluid, output water.").addInfo(BLUEPRINT_INFO).addSeparator()
+ .addController("Front bottom").addInputHatch("Hint block with dot 1")
+ .addInputBus("Hint block with dot 1").addOutputHatch("Hint block with dot 1")
+ .addOutputBus("Hint block with dot 1").addMaintenanceHatch("Hint block with dot 1")
+ .addMufflerHatch("Hint block with dot 1").toolTipFinisher("GTNH: Lanthanides");
return tt;
}
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 cff40a6adc..937ace7aa3 100644
--- a/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
+++ b/src/main/java/com/elisis/gtnhlanth/common/tileentity/DissolutionTank.java
@@ -12,12 +12,19 @@ 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.List;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.FluidStack;
+
import com.elisis.gtnhlanth.loader.RecipeAdder;
import com.elisis.gtnhlanth.util.DescTextLocalization;
import com.github.bartimaeusnek.bartworks.common.loaders.ItemRegistry;
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.interfaces.ISecondaryDescribable;
import gregtech.api.interfaces.ITexture;
@@ -27,22 +34,19 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_EnhancedMul
import gregtech.api.render.TextureFactory;
import gregtech.api.util.GT_Multiblock_Tooltip_Builder;
import gregtech.api.util.GT_Recipe;
-import java.util.List;
-import net.minecraft.block.Block;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.FluidStack;
public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<DissolutionTank>
implements IConstructable, ISecondaryDescribable {
private final 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"}
- }))
+ .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(
@@ -53,8 +57,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
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();
+ .addElement('g', ofBlockAdder(DissolutionTank::addGlass, ItemRegistry.bw_glasses[0], 1)).build();
public DissolutionTank(String name) {
super(name);
@@ -92,8 +95,8 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
ItemStack[] tItems = this.getStoredInputs().toArray(new ItemStack[0]);
long tVoltage = this.getMaxInputVoltage();
- GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes.findRecipe(
- getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
+ GT_Recipe tRecipe = RecipeAdder.instance.DissolutionTankRecipes
+ .findRecipe(getBaseMetaTileEntity(), false, tVoltage, tFluidInputArray, tItems);
if (tRecipe == null || !tRecipe.isRecipeInputEqual(true, tFluidInputArray, tItems)) return false;
// GT_Log.out.print("Recipe not null\n");
@@ -112,7 +115,7 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
return false;
}
- this.mOutputFluids = new FluidStack[] {tRecipe.getFluidOutput(0)};
+ this.mOutputFluids = new FluidStack[] { tRecipe.getFluidOutput(0) };
this.mOutputItems = tRecipe.mOutputs;
return true;
}
@@ -131,8 +134,8 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
FluidStack fluidInputTwo = tFluidInputs.get(1);
// majorInput = ((fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName()))
- // ? fluidInputOne
- // : fluidInputTwo);
+ // ? fluidInputOne
+ // : fluidInputTwo);
// GT_Log.out.print(majorInput.getLocalizedName());
if (fluidInputOne.getUnlocalizedName().equals(majorGenericFluid.getUnlocalizedName())) {
if (fluidInputTwo.getUnlocalizedName().equals(minorGenericFluid.getUnlocalizedName())) {
@@ -184,54 +187,30 @@ public class DissolutionTank extends GT_MetaTileEntity_EnhancedMultiBlockBase<Di
}
@Override
- public ITexture[] getTexture(
- IGregTechTileEntity te, byte side, byte facing, byte colorIndex, boolean active, boolean redstone) {
+ 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()
- };
+ 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]};
+ 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")
+ tt.addMachineType("Dissolution Tank").addInfo("Controller block for the Dissolution Tank")
.addInfo("Input Water and Fluid, output Fluid")
- .addInfo("You must input the Fluids at the correct Ratio")
- .addInfo(BLUEPRINT_INFO)
- .addSeparator()
- .addController("Front bottom")
- .addInputHatch("Hint block with dot 1")
- .addInputBus("Hint block with dot 1")
- .addOutputHatch("Hint block with dot 1")
- .addOutputBus("Hint block with dot 1")
- .addMaintenanceHatch("Hint block with dot 1")
+ .addInfo("You must input the Fluids at the correct Ratio").addInfo(BLUEPRINT_INFO).addSeparator()
+ .addController("Front bottom").addInputHatch("Hint block with dot 1")
+ .addInputBus("Hint block with dot 1").addOutputHatch("Hint block with dot 1")
+ .addOutputBus("Hint block with dot 1").addMaintenanceHatch("Hint block with dot 1")
.toolTipFinisher("GTNH: Lanthanides");
return tt;
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
index 06b48131dc..5c8369a4ec 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/BotRecipes.java
@@ -3,8 +3,19 @@ package com.elisis.gtnhlanth.loader;
import static com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool.*;
import static gregtech.api.enums.OrePrefixes.*;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.Collection;
+import java.util.HashSet;
+
+import net.minecraft.item.ItemStack;
+import net.minecraftforge.fluids.Fluid;
+import net.minecraftforge.fluids.FluidStack;
+
import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+
import cpw.mods.fml.common.Loader;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.Materials;
@@ -13,19 +24,9 @@ import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import ic2.core.Ic2Items;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.Collection;
-import java.util.HashSet;
-import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
-import net.minecraftforge.fluids.FluidStack;
/*
- *
* Originally authored by botn365 under the MIT License. See BotdustriesLICENSE
- *
*/
public class BotRecipes {
@@ -88,21 +89,28 @@ public class BotRecipes {
// CaCl2 + Na2WO4 = 2NaCl + CaWO4
ItemStack Ca2Cl = WerkstoffLoader.CalciumChloride.get(dust, 3);
- GT_Values.RA.addChemicalRecipe(
- Ca2Cl, null, sodiumTungsten, null, scheelite, Materials.Salt.getDust(4), 100, 480);
+ GT_Values.RA
+ .addChemicalRecipe(Ca2Cl, null, sodiumTungsten, null, scheelite, Materials.Salt.getDust(4), 100, 480);
ItemStack H2WO4 = TungsticAcid.get(dust, 7);
// CaWO4 + 2HCl = H2WO4 + CaCl2
GT_Values.RA.addChemicalRecipe(
- scheelite, null, Materials.HydrochloricAcid.getFluid(2000), null, H2WO4, Ca2Cl, 50, 1920);
+ scheelite,
+ null,
+ Materials.HydrochloricAcid.getFluid(2000),
+ null,
+ H2WO4,
+ Ca2Cl,
+ 50,
+ 1920);
ItemStack WO3 = TungstenTrioxide.get(dust, 4);
// H2WO4 = WO3 + H2O
GT_Values.RA.addBlastRecipe(H2WO4, null, null, null, WO3, null, 200, 480, 1200);
- // ItemStack WO3Fe = TungstenSteelOxide.get(dust, 2);
- // GT_Values.RA.addMixerRecipe(WO3, Materials.Steel.getDust(1), null, null, null, null,
- // WO3Fe, 100, 1920);
+ // ItemStack WO3Fe = TungstenSteelOxide.get(dust, 2);
+ // GT_Values.RA.addMixerRecipe(WO3, Materials.Steel.getDust(1), null, null, null, null,
+ // WO3Fe, 100, 1920);
// WO3 + 6H = W + 3H2O
GT_Values.RA.addBlastRecipe(
@@ -267,18 +275,9 @@ public class BotRecipes {
// LMP-103S
/*
- GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C24},
- new FluidStack[] {
- AmmoniumDinitramide.getFluidOrGas(6000),
- Materials.Methanol.getFluid(2000),
- Materials.Ammonia.getGas(500),
- Materials.Water.getFluid(1500)
- },
- new FluidStack[] {LMP103S.getFluidOrGas(10000)},
- null,
- 1200,
- 1920);
+ * GT_Values.RA.addMultiblockChemicalRecipe( new ItemStack[] {C24}, new FluidStack[] {
+ * AmmoniumDinitramide.getFluidOrGas(6000), Materials.Methanol.getFluid(2000), Materials.Ammonia.getGas(500),
+ * Materials.Water.getFluid(1500) }, new FluidStack[] {LMP103S.getFluidOrGas(10000)}, null, 1200, 1920);
*/
// P4O10 + 2HNO3 + 5H2O = 4H3PO4 + N2O5
@@ -325,10 +324,10 @@ public class BotRecipes {
480);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2},
+ new ItemStack[] { AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3), C2 },
null,
- new FluidStack[] {Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000)},
- new ItemStack[] {WerkstoffLoader.SodiumNitrate.get(dust, 5)},
+ new FluidStack[] { Materials.Ammonia.getGas(1000), Materials.Water.getFluid(1000) },
+ new ItemStack[] { WerkstoffLoader.SodiumNitrate.get(dust, 5) },
100,
480);
@@ -344,14 +343,11 @@ public class BotRecipes {
// N2H4O3 + NaOH + H =H2SO4= NH3 + HNO3 + Na + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C24, AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3)},
- new FluidStack[] {Materials.SulfuricAcid.getFluid(1000), Materials.Hydrogen.getGas(1000)},
- new FluidStack[] {
- Materials.Ammonia.getGas(1000),
- Materials.NitricAcid.getFluid(1000),
- Materials.DilutedSulfuricAcid.getFluid(1000)
- },
- new ItemStack[] {Materials.Sodium.getDust(1)},
+ new ItemStack[] { C24, AmmoniumNitrate.get(dust, 9), Materials.SodiumHydroxide.getDust(3) },
+ new FluidStack[] { Materials.SulfuricAcid.getFluid(1000), Materials.Hydrogen.getGas(1000) },
+ new FluidStack[] { Materials.Ammonia.getGas(1000), Materials.NitricAcid.getFluid(1000),
+ Materials.DilutedSulfuricAcid.getFluid(1000) },
+ new ItemStack[] { Materials.Sodium.getDust(1) },
300,
480);
@@ -408,9 +404,9 @@ public class BotRecipes {
7680);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C2, Materials.Palladium.getDustTiny(1)},
- new FluidStack[] {Materials.Hydrogen.getGas(10000), TwoTertButylAnthraquinone.getFluidOrGas(10000)},
- new FluidStack[] {TwoTertButylAnthrahydroquinone.getFluidOrGas(10000)},
+ new ItemStack[] { C2, Materials.Palladium.getDustTiny(1) },
+ new FluidStack[] { Materials.Hydrogen.getGas(10000), TwoTertButylAnthraquinone.getFluidOrGas(10000) },
+ new FluidStack[] { TwoTertButylAnthrahydroquinone.getFluidOrGas(10000) },
null,
1200,
7680);
@@ -428,13 +424,11 @@ public class BotRecipes {
// 2H + 2O =C18H16O2,Pd= H2O2
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C24, Materials.Palladium.getDustTiny(1)},
- new FluidStack[] {
- Materials.Hydrogen.getGas(10000),
- Materials.Oxygen.getGas(10000),
- TwoTertButylAnthraquinone.getFluidOrGas(10000)
- },
- new FluidStack[] {HydrogenPeroxide.getFluidOrGas(5000), TwoTertButylAnthraquinone.getFluidOrGas(10000)},
+ new ItemStack[] { C24, Materials.Palladium.getDustTiny(1) },
+ new FluidStack[] { Materials.Hydrogen.getGas(10000), Materials.Oxygen.getGas(10000),
+ TwoTertButylAnthraquinone.getFluidOrGas(10000) },
+ new FluidStack[] { HydrogenPeroxide.getFluidOrGas(5000),
+ TwoTertButylAnthraquinone.getFluidOrGas(10000) },
null,
1400,
7680);
@@ -481,28 +475,10 @@ public class BotRecipes {
16000);
/*
- GT_Values.RA.addMixerRecipe(
- AmmoniumDinitramide.get(cell, 1),
- C1,
- null,
- null,
- Monomethylhydrazine.getFluidOrGas(2000),
- MonomethylhydrazineFuelMix.getFluidOrGas(3000),
- cells,
- 20,
- 480);
- cells.stackSize = 2;
-
- GT_Values.RA.addMixerRecipe(
- Monomethylhydrazine.get(cell, 2),
- C2,
- null,
- null,
- AmmoniumDinitramide.getFluidOrGas(1000),
- MonomethylhydrazineFuelMix.getFluidOrGas(3000),
- cells,
- 20,
- 480);
+ * GT_Values.RA.addMixerRecipe( AmmoniumDinitramide.get(cell, 1), C1, null, null,
+ * Monomethylhydrazine.getFluidOrGas(2000), MonomethylhydrazineFuelMix.getFluidOrGas(3000), cells, 20, 480);
+ * cells.stackSize = 2; GT_Values.RA.addMixerRecipe( Monomethylhydrazine.get(cell, 2), C2, null, null,
+ * AmmoniumDinitramide.getFluidOrGas(1000), MonomethylhydrazineFuelMix.getFluidOrGas(3000), cells, 20, 480);
*/
cells.stackSize = 1;
@@ -522,27 +498,20 @@ public class BotRecipes {
// BF3 + HF + HNO3 = NO2BF4 + H2O
// 3CH3NO2 + 5HNO3 = 3CO2 + 7H2O + 8NO
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C2},
- new FluidStack[] {
- Materials.HydrofluoricAcid.getFluid(1000),
- BoronTrifluoride.getFluidOrGas(1000),
- Nitromethane.getFluidOrGas(3000),
- Materials.NitricAcid.getFluid(6000),
- },
- new FluidStack[] {
- Materials.CarbonDioxide.getGas(3000),
- Materials.Water.getFluid(8000),
- Materials.NitricOxide.getGas(8000)
- },
- new ItemStack[] {NitroniumTetrafluoroborate.get(dust, 8)},
+ new ItemStack[] { C2 },
+ new FluidStack[] { Materials.HydrofluoricAcid.getFluid(1000), BoronTrifluoride.getFluidOrGas(1000),
+ Nitromethane.getFluidOrGas(3000), Materials.NitricAcid.getFluid(6000), },
+ new FluidStack[] { Materials.CarbonDioxide.getGas(3000), Materials.Water.getFluid(8000),
+ Materials.NitricOxide.getGas(8000) },
+ new ItemStack[] { NitroniumTetrafluoroborate.get(dust, 8) },
100,
7_680);
// NO2BF4 + H4N4O4 = N4O6 + NH4BF4
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C2, NitroniumTetrafluoroborate.get(dust, 8)},
- new FluidStack[] {AmmoniumDinitramide.getFluidOrGas(1000)},
- new FluidStack[] {Trinitramid.getFluidOrGas(1000), AmmoniaBoronfluorideSolution.getFluidOrGas(1000)},
+ new ItemStack[] { C2, NitroniumTetrafluoroborate.get(dust, 8) },
+ new FluidStack[] { AmmoniumDinitramide.getFluidOrGas(1000) },
+ new FluidStack[] { Trinitramid.getFluidOrGas(1000), AmmoniaBoronfluorideSolution.getFluidOrGas(1000) },
null,
20,
30_720);
@@ -573,7 +542,7 @@ public class BotRecipes {
cells.stackSize = 1;
GT_Values.RA.addUniversalDistillationRecipe(
AmmoniaBoronfluorideSolution.getFluidOrGas(1000),
- new FluidStack[] {Materials.Ammonia.getGas(1000), Tetrafluoroborate.getFluidOrGas(1000)},
+ new FluidStack[] { Materials.Ammonia.getGas(1000), Tetrafluoroborate.getFluidOrGas(1000) },
null,
20,
30_720);
@@ -620,56 +589,31 @@ public class BotRecipes {
// N2H4 + C2H4O2 =C2H6O= C2H6N2O + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C2},
- new FluidStack[] {
- Materials.AceticAcid.getFluid(1000), Materials.Ethanol.getFluid(1000), Hydrazine.getFluidOrGas(1000)
- },
- new FluidStack[] {Acetylhydrazine.getFluidOrGas(1000), Materials.Ethanol.getFluid(1000)},
+ new ItemStack[] { C2 },
+ new FluidStack[] { Materials.AceticAcid.getFluid(1000), Materials.Ethanol.getFluid(1000),
+ Hydrazine.getFluidOrGas(1000) },
+ new FluidStack[] { Acetylhydrazine.getFluidOrGas(1000), Materials.Ethanol.getFluid(1000) },
null,
40,
30_720);
// C2H6N2O + 2CH2O + 4H = C2H8N2 + C2H4O2 + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {C2},
- new FluidStack[] {
- Acetylhydrazine.getFluidOrGas(1000),
- Formaldehyde.getFluidOrGas(2000),
- Materials.Hydrogen.getGas(4000)
- },
- new FluidStack[] {
- UnsymmetricalDimethylhydrazine.getFluidOrGas(1000),
- Materials.AceticAcid.getFluid(1000),
- Materials.Water.getFluid(1000)
- },
+ new ItemStack[] { C2 },
+ new FluidStack[] { Acetylhydrazine.getFluidOrGas(1000), Formaldehyde.getFluidOrGas(2000),
+ Materials.Hydrogen.getGas(4000) },
+ new FluidStack[] { UnsymmetricalDimethylhydrazine.getFluidOrGas(1000),
+ Materials.AceticAcid.getFluid(1000), Materials.Water.getFluid(1000) },
null,
20,
122_880);
/*
- cells.stackSize = 2;
- GT_Values.RA.addMixerRecipe(
- UnsymmetricalDimethylhydrazine.get(cell, 2),
- C2,
- null,
- null,
- Trinitramid.getFluidOrGas(1000),
- UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),
- cells,
- 10,
- 120);
-
- cells.stackSize = 1;
- GT_Values.RA.addMixerRecipe(
- Trinitramid.get(cell, 1),
- C2,
- null,
- null,
- UnsymmetricalDimethylhydrazine.getFluidOrGas(2000),
- UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000),
- cells,
- 10,
- 120);
+ * cells.stackSize = 2; GT_Values.RA.addMixerRecipe( UnsymmetricalDimethylhydrazine.get(cell, 2), C2, null,
+ * null, Trinitramid.getFluidOrGas(1000), UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000), cells, 10,
+ * 120); cells.stackSize = 1; GT_Values.RA.addMixerRecipe( Trinitramid.get(cell, 1), C2, null, null,
+ * UnsymmetricalDimethylhydrazine.getFluidOrGas(2000),
+ * UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(3000), cells, 10, 120);
*/
}
@@ -680,10 +624,7 @@ public class BotRecipes {
Method addFuel = rocket.getMethod("addFuel", Fluid.class, int.class);
addFuel.invoke(null, LMP103S.getFluidOrGas(1).getFluid(), 4);
addFuel.invoke(null, MonomethylhydrazineFuelMix.getFluidOrGas(1).getFluid(), 6);
- addFuel.invoke(
- null,
- UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1).getFluid(),
- 8);
+ addFuel.invoke(null, UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1).getFluid(), 8);
}
if (Loader.isModLoaded("miscutils")) {
Class<?> gtppRecipeMap = Class.forName("gregtech.api.util.GTPP_Recipe$GTPP_Recipe_Map");
@@ -691,17 +632,17 @@ public class BotRecipes {
rocketFuels.setAccessible(true);
Class<?> rocketFuelsClass = rocketFuels.getType();
Object rocketFuelsObject = rocketFuels.get(null);
- Method addFuel =
- rocketFuelsClass.getDeclaredMethod("addFuel", FluidStack.class, FluidStack.class, int.class);
+ Method addFuel = rocketFuelsClass
+ .getDeclaredMethod("addFuel", FluidStack.class, FluidStack.class, int.class);
addFuel.invoke(rocketFuelsObject, LMP103S.getFluidOrGas(1000), null, 666);
addFuel.invoke(rocketFuelsObject, MonomethylhydrazineFuelMix.getFluidOrGas(1000), null, 1500);
addFuel.invoke(
- rocketFuelsObject, UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1000), null, 3000);
+ rocketFuelsObject,
+ UnsymmetricalDimethylhydrazineFuelMix.getFluidOrGas(1000),
+ null,
+ 3000);
}
- } catch (ClassNotFoundException
- | NoSuchMethodException
- | IllegalAccessException
- | InvocationTargetException
+ } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException | InvocationTargetException
| NoSuchFieldException e) {
e.printStackTrace();
}
@@ -715,12 +656,8 @@ public class BotRecipes {
public static void removeTungstenElectro() {
Collection<GT_Recipe> electroRecipeMap = GT_Recipe.GT_Recipe_Map.sElectrolyzerRecipes.mRecipeList;
HashSet<GT_Recipe> toDel = new HashSet<>();
- ItemStack[] toRemove = {
- Materials.Scheelite.getDust(1),
- Materials.Tungstate.getDust(1),
- WerkstoffLoader.Ferberite.get(dust, 1),
- WerkstoffLoader.Huebnerit.get(dust, 1)
- };
+ ItemStack[] toRemove = { Materials.Scheelite.getDust(1), Materials.Tungstate.getDust(1),
+ WerkstoffLoader.Ferberite.get(dust, 1), WerkstoffLoader.Huebnerit.get(dust, 1) };
for (GT_Recipe tRecipe : electroRecipeMap) {
if (tRecipe.mFakeRecipe) continue;
for (int i = 0; i < tRecipe.mInputs.length; i++) {
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java b/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
index 73f900a687..e24034c663 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/MetaTileEntity_Loader.java
@@ -1,3 +1,4 @@
package com.elisis.gtnhlanth.loader;
-public class MetaTileEntity_Loader {}
+public class MetaTileEntity_Loader {
+}
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
index f8ea518d92..d8f3e7ff29 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeAdder.java
@@ -1,74 +1,61 @@
package com.elisis.gtnhlanth.loader;
-import gregtech.api.gui.modularui.GT_UITextures;
-import gregtech.api.util.GT_Recipe;
-import gregtech.nei.HeatingCoilSpecialValueFormatter;
import java.util.Collection;
import java.util.HashSet;
+
import net.minecraft.item.ItemStack;
import net.minecraft.util.StatCollector;
import net.minecraftforge.fluids.FluidStack;
+import gregtech.api.gui.modularui.GT_UITextures;
+import gregtech.api.util.GT_Recipe;
+import gregtech.nei.HeatingCoilSpecialValueFormatter;
+
public class RecipeAdder {
public static final RecipeAdder instance = new RecipeAdder();
public final DigestMap DigesterRecipes = (DigestMap) new DigestMap(
- new HashSet<>(100),
- "gtnhlanth.recipe.digester",
- StatCollector.translateToLocal("tile.recipe.digester"),
- null,
- "gtnhlanth:textures/gui/Digester",
- 1,
- 1,
- 1,
- 1,
- 1,
- StatCollector.translateToLocal("value.digester") + ": ", // Heat Capacity
- 1,
- "K",
- false,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
- .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE);
+ new HashSet<>(100),
+ "gtnhlanth.recipe.digester",
+ StatCollector.translateToLocal("tile.recipe.digester"),
+ null,
+ "gtnhlanth:textures/gui/Digester",
+ 1,
+ 1,
+ 1,
+ 1,
+ 1,
+ StatCollector.translateToLocal("value.digester") + ": ", // Heat Capacity
+ 1,
+ "K",
+ false,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
+ .setNEISpecialInfoFormatter(HeatingCoilSpecialValueFormatter.INSTANCE);
public final DissolutionTankMap DissolutionTankRecipes = (DissolutionTankMap) new DissolutionTankMap(
- new HashSet<>(100),
- "gtnhlanth.recipe.disstank",
- StatCollector.translateToLocal("tile.recipe.disstank"),
- null,
- "gtnhlanth:textures/gui/Disstank",
- 2,
- 3,
- 1,
- 1,
- 1,
- StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
- 1,
- ":1",
- false,
- true)
- .setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE)
- .setUsualFluidInputCount(2);
+ new HashSet<>(100),
+ "gtnhlanth.recipe.disstank",
+ StatCollector.translateToLocal("tile.recipe.disstank"),
+ null,
+ "gtnhlanth:textures/gui/Disstank",
+ 2,
+ 3,
+ 1,
+ 1,
+ 1,
+ StatCollector.translateToLocal("value.disstank") + ": ", // Ratio
+ 1,
+ ":1",
+ false,
+ true).setProgressBar(GT_UITextures.PROGRESSBAR_ARROW_MULTIPLE).setUsualFluidInputCount(2);
public class DigestMap extends GT_Recipe.GT_Recipe_Map {
- public DigestMap(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
- boolean aNEIAllowed) {
+ public DigestMap(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName, String aNEIName,
+ String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount, int aMinimalInputItems,
+ int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre, int aNEISpecialValueMultiplier,
+ String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI, boolean aNEIAllowed) {
super(
aRecipeList,
aUnlocalizedName,
@@ -87,21 +74,15 @@ public class RecipeAdder {
aNEIAllowed);
}
- public void addDigesterRecipe(
- FluidStack[] fluidInputs,
- ItemStack[] itemInputs,
- FluidStack fluidOutput,
- ItemStack[] itemOutputs,
- int EUt,
- int ticks,
- int heat) {
+ public void addDigesterRecipe(FluidStack[] fluidInputs, ItemStack[] itemInputs, FluidStack fluidOutput,
+ ItemStack[] itemOutputs, int EUt, int ticks, int heat) {
super.addRecipe(
false,
itemInputs,
itemOutputs,
null,
fluidInputs,
- new FluidStack[] {fluidOutput},
+ new FluidStack[] { fluidOutput },
ticks,
EUt,
heat);
@@ -110,21 +91,10 @@ public class RecipeAdder {
public class DissolutionTankMap extends GT_Recipe.GT_Recipe_Map {
- public DissolutionTankMap(
- Collection<GT_Recipe> aRecipeList,
- String aUnlocalizedName,
- String aLocalName,
- String aNEIName,
- String aNEIGUIPath,
- int aUsualInputCount,
- int aUsualOutputCount,
- int aMinimalInputItems,
- int aMinimalInputFluids,
- int aAmperage,
- String aNEISpecialValuePre,
- int aNEISpecialValueMultiplier,
- String aNEISpecialValuePost,
- boolean aShowVoltageAmperageInNEI,
+ public DissolutionTankMap(Collection<GT_Recipe> aRecipeList, String aUnlocalizedName, String aLocalName,
+ String aNEIName, String aNEIGUIPath, int aUsualInputCount, int aUsualOutputCount,
+ int aMinimalInputItems, int aMinimalInputFluids, int aAmperage, String aNEISpecialValuePre,
+ int aNEISpecialValueMultiplier, String aNEISpecialValuePost, boolean aShowVoltageAmperageInNEI,
boolean aNEIAllowed) {
super(
aRecipeList,
@@ -143,22 +113,17 @@ public class RecipeAdder {
aShowVoltageAmperageInNEI,
aNEIAllowed);
}
+
/** Higher part input fluid first, always **/
- public void addDissolutionTankRecipe(
- FluidStack[] fluidInputs,
- ItemStack[] itemInputs,
- FluidStack fluidOutput,
- ItemStack[] itemOutputs,
- int EUt,
- int ticks,
- int ratio) {
+ public void addDissolutionTankRecipe(FluidStack[] fluidInputs, ItemStack[] itemInputs, FluidStack fluidOutput,
+ ItemStack[] itemOutputs, int EUt, int ticks, int ratio) {
super.addRecipe(
false,
itemInputs,
itemOutputs,
null,
fluidInputs,
- new FluidStack[] {fluidOutput},
+ new FluidStack[] { fluidOutput },
ticks,
EUt,
ratio);
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
index d6b1c7d666..d6f7253156 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/RecipeLoader.java
@@ -2,25 +2,13 @@ package com.elisis.gtnhlanth.loader;
import static gregtech.common.items.GT_MetaGenerated_Item_01.registerCauldronCleaningFor;
-import com.elisis.gtnhlanth.Tags;
-import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
-import com.elisis.gtnhlanth.common.register.LanthItemList;
-import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
-import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul;
-import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
-import cpw.mods.fml.common.Loader;
-import goodgenerator.items.MyMaterial;
-import gregtech.api.enums.GT_Values;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.*;
import java.lang.reflect.Constructor;
import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.util.HashSet;
+
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
@@ -30,8 +18,24 @@ import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
+
import org.apache.commons.lang3.reflect.FieldUtils;
+import com.elisis.gtnhlanth.Tags;
+import com.elisis.gtnhlanth.common.register.BotWerkstoffMaterialPool;
+import com.elisis.gtnhlanth.common.register.LanthItemList;
+import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
+import com.github.bartimaeusnek.bartworks.system.material.GT_Enhancement.PlatinumSludgeOverHaul;
+import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
+
+import cpw.mods.fml.common.Loader;
+import goodgenerator.items.MyMaterial;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.*;
+
public class RecipeLoader {
private static final Materials[] BLACKLIST = null;
@@ -159,7 +163,7 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {10000, 10000},
+ new int[] { 10000, 10000 },
600,
1920);
@@ -176,9 +180,9 @@ public class RecipeLoader {
400);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {GT_Utility.getIntegratedCircuit(12)},
- new FluidStack[] {Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000)},
- new FluidStack[] {WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000)},
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(12) },
+ new FluidStack[] { Materials.NitricAcid.getFluid(1000), Materials.Ammonia.getGas(1000) },
+ new FluidStack[] { WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1000) },
new ItemStack[] {},
30,
400);
@@ -225,7 +229,7 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {10000, 10000},
+ new int[] { 10000, 10000 },
760,
480);
@@ -269,17 +273,10 @@ public class RecipeLoader {
30);
/*
- //Fluorosilicic Acid
- GT_Values.RA.addChemicalRecipe(
- GT_Utility.getIntegratedCircuit(1),
- Materials.SiliconDioxide.getDust(1),
- Materials.HydrofluoricAcid.getFluid(6000),
- WerkstoffMaterialPool.FluorosilicicAcid.getFluidOrGas(1000),
- null,
- 300,
- 600
- );
- */
+ * //Fluorosilicic Acid GT_Values.RA.addChemicalRecipe( GT_Utility.getIntegratedCircuit(1),
+ * Materials.SiliconDioxide.getDust(1), Materials.HydrofluoricAcid.getFluid(6000),
+ * WerkstoffMaterialPool.FluorosilicicAcid.getFluidOrGas(1000), null, 300, 600 );
+ */
// Sodium Fluorosilicate
// 2NaCl + H2SiF6 = 2HCl + Na2SiF6
GT_Values.RA.addChemicalRecipe(
@@ -296,27 +293,20 @@ public class RecipeLoader {
// Methanol
// CH4O + CO + 3O =V2O5= H2C2O4 + H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)},
- new FluidStack[] {
- Materials.Methanol.getFluid(1000),
- Materials.CarbonMonoxide.getGas(1000),
- Materials.Oxygen.getGas(3000)
- },
- new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000)},
+ new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) },
+ new FluidStack[] { Materials.Methanol.getFluid(1000), Materials.CarbonMonoxide.getGas(1000),
+ Materials.Oxygen.getGas(3000) },
+ new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(1000) },
null,
450,
240);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(9), MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1)
- },
- new FluidStack[] {
- Materials.Methanol.getFluid(9000),
- Materials.CarbonMonoxide.getGas(9000),
- Materials.Oxygen.getGas(27000)
- },
- new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(9000)},
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(9),
+ MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) },
+ new FluidStack[] { Materials.Methanol.getFluid(9000), Materials.CarbonMonoxide.getGas(9000),
+ Materials.Oxygen.getGas(27000) },
+ new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(9000) },
null,
4050,
240);
@@ -324,25 +314,24 @@ public class RecipeLoader {
// Ethanol
// C2H6O + 5O =V2O5= H2C2O4 + 2H2O
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1)},
- new FluidStack[] {Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000)},
- new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000)},
+ new ItemStack[] { MyMaterial.vanadiumPentoxide.get(OrePrefixes.dustTiny, 1) },
+ new FluidStack[] { Materials.Ethanol.getFluid(1000), Materials.Oxygen.getGas(5000) },
+ new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(1000), Materials.Water.getFluid(2000) },
null,
450,
240);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(9), MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1)
- },
- new FluidStack[] {Materials.Ethanol.getFluid(9000), Materials.Oxygen.getGas(45000)},
- new FluidStack[] {MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(18000)},
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(9),
+ MyMaterial.vanadiumPentoxide.get(OrePrefixes.dust, 1) },
+ new FluidStack[] { Materials.Ethanol.getFluid(9000), Materials.Oxygen.getGas(45000) },
+ new FluidStack[] { MyMaterial.oxalate.getFluidOrGas(9000), Materials.Water.getFluid(18000) },
null,
4050,
240);
// GT_Values.RA.addChemicalRecipe(
- // GT_Utility.getIntegratedCircuit(2),
+ // GT_Utility.getIntegratedCircuit(2),
// WerkstoffMaterialPool.CeriumDioxide
//
// )
@@ -372,49 +361,39 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {10000},
+ new int[] { 10000 },
150,
120);
// CHAIN BEGIN
// MONAZITE
RecipeAdder.instance.DigesterRecipes.addDigesterRecipe(
- new FluidStack[] {Materials.NitricAcid.getFluid(700)},
- new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 2)},
+ new FluidStack[] { Materials.NitricAcid.getFluid(700) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Monazite, 2) },
WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(400),
- new ItemStack[] {Materials.SiliconDioxide.getDust(1)},
+ new ItemStack[] { Materials.SiliconDioxide.getDust(1) },
1920,
400,
800);
RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe(
- new FluidStack[] {
- Materials.Water.getFluid(10000),
- WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000)
- },
- new ItemStack[] {GT_Utility.getIntegratedCircuit(1), Materials.Saltpeter.getDust(1)},
+ new FluidStack[] { Materials.Water.getFluid(10000),
+ WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(1000) },
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(1), Materials.Saltpeter.getDust(1) },
WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(11000),
- new ItemStack[] {
- WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4),
- WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1),
- Materials.Monazite.getDustTiny(2)
- },
+ new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dustTiny, 4),
+ WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 1), Materials.Monazite.getDustTiny(2) },
480,
900,
10);
RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe(
- new FluidStack[] {
- Materials.Water.getFluid(90000),
- WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(9000)
- },
- new ItemStack[] {GT_Utility.getIntegratedCircuit(9), Materials.Saltpeter.getDust(9)},
+ new FluidStack[] { Materials.Water.getFluid(90000),
+ WerkstoffMaterialPool.MuddyRareEarthMonaziteSolution.getFluidOrGas(9000) },
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(9), Materials.Saltpeter.getDust(9) },
WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(99000),
- new ItemStack[] {
- WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4),
- WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9),
- Materials.Monazite.getDust(2)
- },
+ new ItemStack[] { WerkstoffMaterialPool.HafniaZirconiaBlend.get(OrePrefixes.dust, 4),
+ WerkstoffLoader.Thorianit.get(OrePrefixes.dust, 9), Materials.Monazite.getDust(2) },
480,
8100,
10);
@@ -422,16 +401,12 @@ public class RecipeLoader {
GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe(
false,
null,
- new ItemStack[] {
- WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1),
- Materials.SiliconDioxide.getDust(1),
- Materials.Rutile.getDust(1),
- WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1),
- Materials.Ilmenite.getDust(1)
- },
+ new ItemStack[] { WerkstoffMaterialPool.MonaziteSulfate.get(OrePrefixes.dust, 1),
+ Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1),
+ WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), Materials.Ilmenite.getDust(1) },
null,
- new int[] {9000, 7500, 2000, 500, 2000},
- new FluidStack[] {WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000)},
+ new int[] { 9000, 7500, 2000, 500, 2000 },
+ new FluidStack[] { WerkstoffMaterialPool.DilutedRareEarthMonaziteMud.getFluidOrGas(1000) },
null,
400,
240,
@@ -451,38 +426,28 @@ public class RecipeLoader {
400);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {GT_Utility.getIntegratedCircuit(13)},
- new FluidStack[] {
- WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000),
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200)
- },
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(13) },
+ new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(1000),
+ WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(200) },
null,
- new ItemStack[] {
- WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3),
- },
+ new ItemStack[] { WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dustTiny, 3), },
480,
480);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {GT_Utility.getIntegratedCircuit(14)},
- new FluidStack[] {
- WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000),
- WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800)
- },
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(14) },
+ new FluidStack[] { WerkstoffMaterialPool.DilutedMonaziteSulfate.getFluidOrGas(9000),
+ WerkstoffMaterialPool.AmmoniumNitrate.getFluidOrGas(1800) },
null,
- new ItemStack[] {
- WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3),
- },
+ new ItemStack[] { WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 3), },
4320,
480);
GT_Values.RA.addSifterRecipe(
WerkstoffMaterialPool.AcidicMonazitePowder.get(OrePrefixes.dust, 1),
- new ItemStack[] {
- WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1)
- },
- new int[] {9000, 7000},
+ new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.ThoriumPhosphateCake.get(OrePrefixes.dust, 1) },
+ new int[] { 9000, 7000 },
600,
256);
@@ -502,7 +467,7 @@ public class RecipeLoader {
Materials.Thorium.getDust(1),
Materials.Phosphate.getDust(1),
null,
- new int[] {10000, 10000},
+ new int[] { 10000, 10000 },
200,
480);
@@ -512,18 +477,16 @@ public class RecipeLoader {
WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
null,
null,
- new int[] {10000},
+ new int[] { 10000 },
120,
240);
GT_Values.RA.addSifterRecipe(
WerkstoffMaterialPool.NeutralizedMonaziteRareEarthFiltrate.get(OrePrefixes.dust, 1),
- new ItemStack[] {
- WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1),
- WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1)
- },
- new int[] {9000, 5000, 4000},
+ new ItemStack[] { WerkstoffMaterialPool.MonaziteRareEarthHydroxideConcentrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1),
+ WerkstoffMaterialPool.UraniumFiltrate.get(OrePrefixes.dust, 1) },
+ new int[] { 9000, 5000, 4000 },
800,
480);
@@ -533,20 +496,16 @@ public class RecipeLoader {
WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1),
null,
null,
- new int[] {10000},
+ new int[] { 10000 },
360,
120);
GT_Values.RA.addSifterRecipe(
WerkstoffMaterialPool.NeutralizedUraniumFiltrate.get(OrePrefixes.dust, 1),
- new ItemStack[] {
- Materials.Uranium.getDust(1),
- Materials.Uranium.getDust(1),
- Materials.Uranium.getDust(1),
- Materials.Uranium235.getDust(1),
- Materials.Uranium235.getDust(1),
- },
- new int[] {4500, 4000, 3000, 3000, 2000},
+ new ItemStack[] { Materials.Uranium.getDust(1), Materials.Uranium.getDust(1),
+ Materials.Uranium.getDust(1), Materials.Uranium235.getDust(1),
+ Materials.Uranium235.getDust(1), },
+ new int[] { 4500, 4000, 3000, 3000, 2000 },
1000,
30);
@@ -595,11 +554,11 @@ public class RecipeLoader {
GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe(
false,
null,
- new ItemStack[] {WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1)},
+ new ItemStack[] { WerkstoffMaterialPool.CeriumDioxide.get(OrePrefixes.dust, 1) },
null,
- new int[] {1111},
- new FluidStack[] {WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000)},
- new FluidStack[] {WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)},
+ new int[] { 1111 },
+ new FluidStack[] { WerkstoffMaterialPool.NitricLeachedMonaziteMixture.getFluidOrGas(1000) },
+ new FluidStack[] { WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000) },
400,
240,
0);
@@ -643,12 +602,16 @@ public class RecipeLoader {
GT_Recipe.GT_Recipe_Map.sVacuumRecipes.addRecipe( // Uses fluid, outputs item. Yet another hacky recipe
false,
null,
- new ItemStack[] {
- WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(
- OrePrefixes.dust, 1), // TODO: Perhaps add more shit on output
+ new ItemStack[] { WerkstoffMaterialPool.CooledMonaziteRareEarthConcentrate.get(OrePrefixes.dust, 1), // TODO:
+ // Perhaps
+ // add
+ // more
+ // shit
+ // on
+ // output
},
null,
- new FluidStack[] {WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000)},
+ new FluidStack[] { WerkstoffMaterialPool.NitricMonaziteLeachedConcentrate.getFluidOrGas(1000) },
null,
100,
240,
@@ -659,7 +622,7 @@ public class RecipeLoader {
WerkstoffMaterialPool.MonaziteRarerEarthSediment.get(OrePrefixes.dust, 1),
WerkstoffMaterialPool.EuropiumOxide.get(OrePrefixes.dust, 2), // Maybe also holmium
null,
- new int[] {9000, 500},
+ new int[] { 9000, 500 },
600,
1920);
@@ -685,7 +648,7 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {10000, 10000},
+ new int[] { 10000, 10000 },
600,
33000);
@@ -722,24 +685,11 @@ public class RecipeLoader {
400,
240);
/*
- GT_Values.RA.addCentrifugeRecipe(
- WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 2),
- null,
- null,
- Materials.Chloromethane.getGas(200),
- WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 6),
- null, //TODO
- null,
- null,
- null,
- null,
- new int[] {
- 10000, //10000
- },
- 700,
- 1920
- );
- */
+ * GT_Values.RA.addCentrifugeRecipe(
+ * WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 2), null, null,
+ * Materials.Chloromethane.getGas(200), WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dustSmall, 6),
+ * null, //TODO null, null, null, null, new int[] { 10000, //10000 }, 700, 1920 );
+ */
GT_Values.RA.addCentrifugeRecipe(
GT_Utility.getIntegratedCircuit(4),
WerkstoffMaterialPool.SaturatedMonaziteRareEarthMixture.get(OrePrefixes.dust, 8),
@@ -751,25 +701,24 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {
- 10000, // 10000
+ new int[] { 10000, // 10000
},
6300,
1920);
GT_Values.RA.addSifterRecipe(
WerkstoffMaterialPool.SamaricResidue.get(OrePrefixes.dust, 9),
- new ItemStack[] {Materials.Samarium.getDust(6), Materials.Gadolinium.getDust(3)},
- new int[] {10000, 10000},
+ new ItemStack[] { Materials.Samarium.getDust(6), Materials.Gadolinium.getDust(3) },
+ new int[] { 10000, 10000 },
400,
1920);
// BASTNASITE (god help me)
RecipeAdder.instance.DigesterRecipes.addDigesterRecipe(
- new FluidStack[] {Materials.NitricAcid.getFluid(700)},
- new ItemStack[] {GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2)},
+ new FluidStack[] { Materials.NitricAcid.getFluid(700) },
+ new ItemStack[] { GT_OreDictUnificator.get(OrePrefixes.crushed, Materials.Bastnasite, 2) },
WerkstoffMaterialPool.MuddyRareEarthBastnasiteSolution.getFluidOrGas(400),
- new ItemStack[] {Materials.SiliconDioxide.getDust(1)},
+ new ItemStack[] { Materials.SiliconDioxide.getDust(1) },
1920,
400,
800);
@@ -794,12 +743,11 @@ public class RecipeLoader {
120);
RecipeAdder.instance.DissolutionTankRecipes.addDissolutionTankRecipe(
- new FluidStack[] {
- Materials.Water.getFluid(10000), WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000)
- },
- new ItemStack[] {Materials.Saltpeter.getDust(1)},
+ new FluidStack[] { Materials.Water.getFluid(10000),
+ WerkstoffMaterialPool.ConditionedBastnasiteMud.getFluidOrGas(1000) },
+ new ItemStack[] { Materials.Saltpeter.getDust(1) },
WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(11000),
- new ItemStack[] {WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1)},
+ new ItemStack[] { WerkstoffMaterialPool.Gangue.get(OrePrefixes.dust, 1) },
1920,
1000,
10);
@@ -807,16 +755,14 @@ public class RecipeLoader {
GT_Recipe.GT_Recipe_Map.sSifterRecipes.addRecipe(
false,
null,
- new ItemStack[] {
- Materials.SiliconDioxide.getDust(1),
- Materials.Rutile.getDust(1),
- WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), // TODO:Change outputs to complement Monazite
- Materials.Ilmenite.getDust(1)
- },
+ new ItemStack[] { Materials.SiliconDioxide.getDust(1), Materials.Rutile.getDust(1),
+ WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 1), // TODO:Change outputs to complement
+ // Monazite
+ Materials.Ilmenite.getDust(1) },
null,
- new int[] {9000, 7500, 1000, 500, 2000},
- new FluidStack[] {WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000)},
- new FluidStack[] {WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400)},
+ new int[] { 9000, 7500, 1000, 500, 2000 },
+ new FluidStack[] { WerkstoffMaterialPool.DiltedRareEarthBastnasiteMud.getFluidOrGas(1000) },
+ new FluidStack[] { WerkstoffMaterialPool.FilteredBastnasiteMud.getFluidOrGas(400) },
400,
240,
0);
@@ -838,7 +784,7 @@ public class RecipeLoader {
WerkstoffMaterialPool.LeachedBastnasiteRareEarthOxides.get(OrePrefixes.dust, 1),
null,
null,
- new int[] {10000},
+ new int[] { 10000 },
200,
30);
@@ -884,7 +830,7 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {10000, 9000},
+ new int[] { 10000, 9000 },
600,
480);
@@ -919,7 +865,7 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {8000, 5000},
+ new int[] { 8000, 5000 },
900,
480);
@@ -1007,7 +953,7 @@ public class RecipeLoader {
null,
null,
null,
- new int[] {9000, 8000, 10000},
+ new int[] { 9000, 8000, 10000 },
200,
1920);
}
@@ -1077,11 +1023,10 @@ public class RecipeLoader {
1920);
GT_Values.RA.addMultiblockChemicalRecipe(
- new ItemStack[] {
- GT_Utility.getIntegratedCircuit(9), WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dust, 1)
- },
- new FluidStack[] {Materials.Butane.getGas(9000)},
- new FluidStack[] {WerkstoffMaterialPool.Butanediol.getFluidOrGas(9000)},
+ new ItemStack[] { GT_Utility.getIntegratedCircuit(9),
+ WerkstoffMaterialPool.MoTeOCatalyst.get(OrePrefixes.dust, 1) },
+ new FluidStack[] { Materials.Butane.getGas(9000) },
+ new FluidStack[] { WerkstoffMaterialPool.Butanediol.getFluidOrGas(9000) },
null,
8100,
1920);
@@ -1140,15 +1085,11 @@ public class RecipeLoader {
480);
// Digester Control Block
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemList.Hull_IV.get(1L),
- ItemList.Super_Tank_EV.get(2L),
- ItemList.Electric_Motor_IV.get(4L),
- ItemList.Electric_Pump_IV.get(4L),
- GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L),
- GT_Utility.getIntegratedCircuit(1)
- },
+ new ItemStack[] { ItemList.Hull_IV.get(1L), ItemList.Super_Tank_EV.get(2L),
+ ItemList.Electric_Motor_IV.get(4L), ItemList.Electric_Pump_IV.get(4L),
+ GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.Desh, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Master, 4L),
+ GT_Utility.getIntegratedCircuit(1) },
Materials.Polytetrafluoroethylene.getMolten(1440),
LanthItemList.DIGESTER,
600,
@@ -1156,15 +1097,11 @@ public class RecipeLoader {
// Dissolution Tank
GT_Values.RA.addAssemblerRecipe(
- new ItemStack[] {
- ItemList.Hull_EV.get(1L),
- ItemList.Super_Tank_HV.get(2L),
- ItemList.Electric_Motor_EV.get(4L),
- ItemList.Electric_Pump_EV.get(2L),
- GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L),
- GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L),
- GT_Utility.getIntegratedCircuit(2)
- },
+ new ItemStack[] { ItemList.Hull_EV.get(1L), ItemList.Super_Tank_HV.get(2L),
+ ItemList.Electric_Motor_EV.get(4L), ItemList.Electric_Pump_EV.get(2L),
+ GT_OreDictUnificator.get(OrePrefixes.rotor, Materials.VibrantAlloy, 4L),
+ GT_OreDictUnificator.get(OrePrefixes.circuit, Materials.Data, 4L),
+ GT_Utility.getIntegratedCircuit(2) },
Materials.Polytetrafluoroethylene.getMolten(720),
LanthItemList.DISSOLUTION_TANK,
400,
@@ -1229,10 +1166,8 @@ public class RecipeLoader {
if (GT_Utility.isStackValid(input)) {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
- if ((OreDictionary.getOreName(oreDictID).startsWith("ore")
- || OreDictionary.getOreName(oreDictID)
- .startsWith(
- "crushed")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ if ((OreDictionary.getOreName(oreDictID).startsWith("ore") || OreDictionary.getOreName(oreDictID)
+ .startsWith("crushed")) /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) {
GT_Log.out.print(OreDictionary.getOreName(oreDictID));
GT_Recipe tRecipe = recipe.copy();
boolean modified = false;
@@ -1277,7 +1212,7 @@ public class RecipeLoader {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
if (OreDictionary.getOreName(oreDictID)
- .startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) {
GT_Recipe tRecipe = recipe.copy();
boolean modified = false;
for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -1324,9 +1259,8 @@ public class RecipeLoader {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
if ((OreDictionary.getOreName(oreDictID).startsWith("crushed")
- || OreDictionary.getOreName(oreDictID)
- .startsWith(
- "purified")) /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ || OreDictionary.getOreName(oreDictID).startsWith(
+ "purified")) /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) {
GT_Recipe tRecipe = recipe.copy();
boolean modified = false;
for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -1376,9 +1310,14 @@ public class RecipeLoader {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
if (OreDictionary.getOreName(oreDictID).startsWith("dust")
- && (!OreDictionary.getOreName(oreDictID)
- .contains(
- "Dephosphated")) /*OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustImpureCerium") || OreDictionary.getOreName(oreDictID).startsWith("dustSpace") || OreDictionary.getOreName(oreDictID).startsWith("dustCerium")*/) {
+ && (!OreDictionary.getOreName(oreDictID).contains(
+ "Dephosphated")) /*
+ * OreDictionary.getOreName(oreDictID).startsWith("dustPureCerium")
+ * || OreDictionary.getOreName(oreDictID).startsWith(
+ * "dustImpureCerium") ||
+ * OreDictionary.getOreName(oreDictID).startsWith("dustSpace") ||
+ * OreDictionary.getOreName(oreDictID).startsWith("dustCerium")
+ */) {
GT_Recipe tRecipe = recipe.copy();
boolean modified = false;
for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -1424,15 +1363,12 @@ public class RecipeLoader {
}
}
/*
- GT_Recipe tRecipe = recipe.copy();
- if (GT_Utility.isStackValid(fluidInput)) {
- if (fluidInput.getLocalizedName() == MyMaterial.plutoniumBasedLiquidFuel.getDefaultName()) {
- tRecipe.mOutputs[1] = GT_Utility.copyAmount(tRecipe.mOutputs[1].stackSize * 2, WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
- reAdd.add(tRecipe);
- remove.add(tRecipe);
- }
-
- }*/
+ * GT_Recipe tRecipe = recipe.copy(); if (GT_Utility.isStackValid(fluidInput)) { if
+ * (fluidInput.getLocalizedName() == MyMaterial.plutoniumBasedLiquidFuel.getDefaultName()) {
+ * tRecipe.mOutputs[1] = GT_Utility.copyAmount(tRecipe.mOutputs[1].stackSize * 2,
+ * WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1)); reAdd.add(tRecipe);
+ * remove.add(tRecipe); } }
+ */
}
GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.removeAll(remove);
GT_Recipe.GT_Recipe_Map.sCentrifugeRecipes.mRecipeList.addAll(reAdd);
@@ -1452,7 +1388,7 @@ public class RecipeLoader {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
if (OreDictionary.getOreName(oreDictID)
- .startsWith("crushed") /*&& OreDictionary.getOreName(oreDictID).contains("Cerium")*/) {
+ .startsWith("crushed") /* && OreDictionary.getOreName(oreDictID).contains("Cerium") */) {
GT_Recipe tRecipe = recipe.copy();
boolean modified = false;
for (int i = 0; i < tRecipe.mOutputs.length; i++) {
@@ -1497,8 +1433,7 @@ public class RecipeLoader {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
String oreName = OreDictionary.getOreName(oreDictID);
- if (oreName.equals("dustHibonite")
- || oreName.equals("dustLanthaniteCe")
+ if (oreName.equals("dustHibonite") || oreName.equals("dustLanthaniteCe")
|| oreName.equals("dustZirconolite")
|| oreName.equals("dustYttrocerite")
|| oreName.equals("dustXenotime")
@@ -1513,16 +1448,26 @@ public class RecipeLoader {
tRecipe.mOutputs[i].stackSize,
WerkstoffMaterialPool.CeriumRichMixture.get(OrePrefixes.dust, 1));
modified = true;
- } else if (tRecipe.mOutputs[i].isItemEqual(WerkstoffMaterialPool.Zirconium.get(
- OrePrefixes.dust, 1))) { // TODO: Does not work and I have zero clue why
- tRecipe.mOutputs[i] = null;
- modified = true;
- } else if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
- tRecipe.mOutputs[i] = GT_Utility.copyAmount(
- tRecipe.mOutputs[i].stackSize,
- WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
- modified = true;
- }
+ } else if (tRecipe.mOutputs[i]
+ .isItemEqual(WerkstoffMaterialPool.Zirconium.get(OrePrefixes.dust, 1))) { // TODO:
+ // Does
+ // not
+ // work
+ // and
+ // I
+ // have
+ // zero
+ // clue
+ // why
+ tRecipe.mOutputs[i] = null;
+ modified = true;
+ } else
+ if (tRecipe.mOutputs[i].isItemEqual(Materials.Samarium.getDust(1))) {
+ tRecipe.mOutputs[i] = GT_Utility.copyAmount(
+ tRecipe.mOutputs[i].stackSize,
+ WerkstoffMaterialPool.SamariumOreConcentrate.get(OrePrefixes.dust, 1));
+ modified = true;
+ }
}
if (modified) {
reAdd.add(tRecipe);
@@ -1599,8 +1544,7 @@ public class RecipeLoader {
int[] oreDict = OreDictionary.getOreIDs(input);
for (int oreDictID : oreDict) {
String oreName = OreDictionary.getOreName(oreDictID);
- if (oreName.equals("dustCerite")
- || oreName.equals("dustFluorcaphite")
+ if (oreName.equals("dustCerite") || oreName.equals("dustFluorcaphite")
|| oreName.equals("dustZirkelite")
|| oreName.equals("dustGadoliniteCe")
|| oreName.equals("dustGadoliniteY")
@@ -1637,35 +1581,17 @@ public class RecipeLoader {
GT_Log.out.print("Dehydrator done!\n");
}
- /* DOES NOT WORK, something to do with load times for sifter recipes or some shit
- //Sifter
- for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) {
- if (recipe.mInputs.length == 0)
- break;
- ItemStack input = recipe.mInputs[0];
- GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n");
- if (GT_Utility.isStackValid(input)) {
- if (true) {
- GT_Log.out.print("Sift ore found and iffed " + input.getDisplayName() + "\n");
- //GT_Recipe tRecipe = recipe.copy();
- remove.add(recipe);
- break;
- }
- }
-
- }
-
- GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove);
- GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd);
- GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit();
-
- GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() + "! ");
-
- remove.clear();
- reAdd.clear();
-
- GT_Log.out.print("Sifter done!\n");
- */
+ /*
+ * DOES NOT WORK, something to do with load times for sifter recipes or some shit //Sifter for (GT_Recipe recipe
+ * : GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList) { if (recipe.mInputs.length == 0) break; ItemStack
+ * input = recipe.mInputs[0]; GT_Log.out.print("Sift ore found " + input.getDisplayName() + "\n"); if
+ * (GT_Utility.isStackValid(input)) { if (true) { GT_Log.out.print("Sift ore found and iffed " +
+ * input.getDisplayName() + "\n"); //GT_Recipe tRecipe = recipe.copy(); remove.add(recipe); break; } } }
+ * GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.removeAll(remove);
+ * GT_Recipe.GT_Recipe_Map.sSifterRecipes.mRecipeList.addAll(reAdd);
+ * GT_Recipe.GT_Recipe_Map.sSifterRecipes.reInit(); GT_Log.out.print(Tags.MODID + ": Replace " + remove.size() +
+ * "! "); remove.clear(); reAdd.clear(); GT_Log.out.print("Sifter done!\n");
+ */
// Chemical Bath
for (GT_Recipe recipe : GT_Recipe.GT_Recipe_Map.sChemicalBathRecipes.mRecipeList) {
// ItemStack input = recipe.mInputs[0];
@@ -1732,7 +1658,8 @@ public class RecipeLoader {
// For Cauldron Wash
registerCauldronCleaningFor(Materials.Cerium, WerkstoffMaterialPool.CeriumRichMixture.getBridgeMaterial());
registerCauldronCleaningFor(
- Materials.Samarium, WerkstoffMaterialPool.SamariumOreConcentrate.getBridgeMaterial());
+ Materials.Samarium,
+ WerkstoffMaterialPool.SamariumOreConcentrate.getBridgeMaterial());
GT_Log.out.print(Tags.MODID + ": Replace 3! ");
GT_Log.out.print("Cauldron Wash done!\n");
@@ -1749,25 +1676,16 @@ public class RecipeLoader {
// I use and copy some private methods in Bartworks because his system runs well.
// Bartworks is under MIT License
/*
- * Copyright (c) 2018-2020 bartimaeusnek
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
+ * Copyright (c) 2018-2020 bartimaeusnek Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute,
+ * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions: The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ * KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ * IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
public static void replaceInCraftTable(Object obj) {
@@ -1856,8 +1774,7 @@ public class RecipeLoader {
try {
isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Cerium);
- } catch (InvocationTargetException | IllegalAccessException ignored) {
- }
+ } catch (InvocationTargetException | IllegalAccessException ignored) {}
if (isOk) return;
try {
@@ -1872,8 +1789,7 @@ public class RecipeLoader {
try {
isOk = (boolean) recipeCheck.invoke(BartObj, input, Materials.Samarium);
- } catch (InvocationTargetException | IllegalAccessException ignored) {
- }
+ } catch (InvocationTargetException | IllegalAccessException ignored) {}
if (isOk) return;
try {
diff --git a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
index 6042d25798..90b8c503ac 100644
--- a/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
+++ b/src/main/java/com/elisis/gtnhlanth/loader/ZPMRubberChanges.java
@@ -2,22 +2,6 @@ package com.elisis.gtnhlanth.loader;
import static gregtech.api.enums.OrePrefixes.*;
-import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
-import com.github.bartimaeusnek.bartworks.API.LoaderReference;
-import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
-import com.github.bartimaeusnek.bartworks.util.BW_Util;
-import gregtech.api.enums.ItemList;
-import gregtech.api.enums.Materials;
-import gregtech.api.enums.OrePrefixes;
-import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_Log;
-import gregtech.api.util.GT_ModHandler;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.api.util.GT_Recipe;
-import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
-import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
-import gregtech.api.util.GT_Shaped_Recipe;
-import gregtech.api.util.GT_Utility;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -27,14 +11,34 @@ import java.util.HashSet;
import java.util.List;
import java.util.function.Consumer;
import java.util.function.Predicate;
+
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.CraftingManager;
import net.minecraft.item.crafting.IRecipe;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.FluidStack;
+
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.commons.lang3.reflect.MethodUtils;
+import com.elisis.gtnhlanth.common.register.WerkstoffMaterialPool;
+import com.github.bartimaeusnek.bartworks.API.LoaderReference;
+import com.github.bartimaeusnek.bartworks.system.material.Werkstoff;
+import com.github.bartimaeusnek.bartworks.util.BW_Util;
+
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.objects.ItemData;
+import gregtech.api.util.GT_Log;
+import gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GT_Recipe;
+import gregtech.api.util.GT_Recipe.GT_Recipe_AssemblyLine;
+import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
+import gregtech.api.util.GT_Shaped_Recipe;
+import gregtech.api.util.GT_Utility;
+
public class ZPMRubberChanges implements Runnable {
@SuppressWarnings("unchecked")
@@ -43,22 +47,20 @@ public class ZPMRubberChanges implements Runnable {
List<IRecipe> bufferedRecipeList = null;
try {
- bufferedRecipeList =
- (List<IRecipe>) FieldUtils.getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true)
- .get(null);
+ bufferedRecipeList = (List<IRecipe>) FieldUtils
+ .getDeclaredField(GT_ModHandler.class, "sBufferRecipeList", true).get(null);
} catch (IllegalAccessException e) {
e.printStackTrace();
}
HashSet<ItemStack> ZPMPlusComponents = new HashSet<>();
- OrePrefixes[] RubberGenerated = {plate};
+ OrePrefixes[] RubberGenerated = { plate };
Arrays.stream(ItemList.values())
- .filter(item -> (item.toString().contains("ZPM")
- || item.toString().contains("UV")
+ .filter(
+ item -> (item.toString().contains("ZPM") || item.toString().contains("UV")
|| item.toString().contains("UHV")
- || item.toString().contains("UEV"))
- && item.hasBeenSet())
+ || item.toString().contains("UEV")) && item.hasBeenSet())
.forEach(item -> ZPMPlusComponents.add(item.get(1)));
if (LoaderReference.dreamcraft) {
@@ -72,8 +74,8 @@ public class ZPMRubberChanges implements Runnable {
replaceAllRecipes(ZPMPlusComponents, RubberGenerated, bufferedRecipeList);
}
- private static void replaceAllRecipes(
- Collection<ItemStack> ZPMPlusComponents, OrePrefixes[] RubberGenerated, List<IRecipe> bufferedRecipeList) {
+ private static void replaceAllRecipes(Collection<ItemStack> ZPMPlusComponents, OrePrefixes[] RubberGenerated,
+ List<IRecipe> bufferedRecipeList) {
for (GT_Recipe_AssemblyLine sAssemblylineRecipe : GT_Recipe_AssemblyLine.sAssemblylineRecipes) {
for (ItemStack stack : ZPMPlusComponents) {
@@ -95,10 +97,10 @@ public class ZPMRubberChanges implements Runnable {
rewriteCraftingRecipes(bufferedRecipeList, RubberGenerated, recipeFilter);
}
/*
- for (ItemStack stack : LuVMachines) {
- Predicate recipeFilter = obj -> obj instanceof GT_Shaped_Recipe && GT_Utility.areStacksEqual(((GT_Shaped_Recipe) obj).getRecipeOutput(), stack, true);
- rewriteCraftingRecipes(bufferedRecipeList, LuVMaterialsGenerated, recipeFilter);
- }*/
+ * for (ItemStack stack : LuVMachines) { Predicate recipeFilter = obj -> obj instanceof GT_Shaped_Recipe &&
+ * GT_Utility.areStacksEqual(((GT_Shaped_Recipe) obj).getRecipeOutput(), stack, true);
+ * rewriteCraftingRecipes(bufferedRecipeList, LuVMaterialsGenerated, recipeFilter); }
+ */
}
private static void addDreamcraftItemListItems(Collection ZPMPlusComponents) {
@@ -106,13 +108,10 @@ public class ZPMRubberChanges implements Runnable {
Class customItemListClass = Class.forName("com.dreammaster.gthandler.CustomItemList");
Method hasnotBeenSet = MethodUtils.getAccessibleMethod(customItemListClass, "hasBeenSet");
Method get = MethodUtils.getAccessibleMethod(customItemListClass, "get", long.class, Object[].class);
- for (Enum customItemList : (Enum[])
- FieldUtils.getField(customItemListClass, "$VALUES", true).get(null)) {
- if ((customItemList.toString().contains("ZPM")
- || customItemList.toString().contains("UV")
- || customItemList.toString().contains("UHV")
- || customItemList.toString().contains("UEV"))
- && (boolean) hasnotBeenSet.invoke(customItemList))
+ for (Enum customItemList : (Enum[]) FieldUtils.getField(customItemListClass, "$VALUES", true).get(null)) {
+ if ((customItemList.toString().contains("ZPM") || customItemList.toString().contains("UV")
+ || customItemList.toString().contains("UHV")
+ || customItemList.toString().contains("UEV")) && (boolean) hasnotBeenSet.invoke(customItemList))
ZPMPlusComponents.add((ItemStack) get.invoke(customItemList, 1, new Object[0]));
}
} catch (IllegalAccessException | ClassNotFoundException | InvocationTargetException e) {
@@ -120,8 +119,8 @@ public class ZPMRubberChanges implements Runnable {
}
}
- private static void rewriteCraftingRecipes(
- List<IRecipe> bufferedRecipeList, OrePrefixes[] RubberGenerated, Predicate recipeFilter) {
+ private static void rewriteCraftingRecipes(List<IRecipe> bufferedRecipeList, OrePrefixes[] RubberGenerated,
+ Predicate recipeFilter) {
for (OrePrefixes prefixes : RubberGenerated) {
Consumer recipeAction = (obj) -> {
@@ -138,13 +137,12 @@ public class ZPMRubberChanges implements Runnable {
};
/*
- || ZPMRubberChanges.doStacksCointainAndReplace(((GT_Shaped_Recipe) obj).getInput(),
- GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true,
- WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));*/
+ * || ZPMRubberChanges.doStacksCointainAndReplace(((GT_Shaped_Recipe) obj).getInput(),
+ * GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1), true,
+ * WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
+ */
- CraftingManager.getInstance().getRecipeList().stream()
- .filter(recipeFilter)
- .forEach(recipeAction);
+ CraftingManager.getInstance().getRecipeList().stream().filter(recipeFilter).forEach(recipeAction);
bufferedRecipeList.stream().filter(recipeFilter).forEach(recipeAction);
}
}
@@ -244,8 +242,8 @@ public class ZPMRubberChanges implements Runnable {
}
}
- private static void rewriteAsslineRecipes(
- ItemStack stack, OrePrefixes[] RubberGenerated, GT_Recipe.GT_Recipe_AssemblyLine recipe) {
+ private static void rewriteAsslineRecipes(ItemStack stack, OrePrefixes[] RubberGenerated,
+ GT_Recipe.GT_Recipe_AssemblyLine recipe) {
for (OrePrefixes prefixes : RubberGenerated) {
if (ZPMRubberChanges.doStacksCointainAndReplace(recipe.mInputs, stack, false)) {
@@ -257,7 +255,7 @@ public class ZPMRubberChanges implements Runnable {
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
ZPMRubberChanges.doStacksCointainAndReplace(
- new Object[] {recipe.mOutput},
+ new Object[] { recipe.mOutput },
GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
@@ -268,19 +266,19 @@ public class ZPMRubberChanges implements Runnable {
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
ZPMRubberChanges.doStacksCointainAndReplace(
- new Object[] {recipe.mOutput},
+ new Object[] { recipe.mOutput },
GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
}
- if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[] {recipe.mOutput}, stack, false)) {
+ if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[] { recipe.mOutput }, stack, false)) {
ZPMRubberChanges.doStacksCointainAndReplace(
recipe.mInputs,
GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
ZPMRubberChanges.doStacksCointainAndReplace(
- new Object[] {recipe.mOutput},
+ new Object[] { recipe.mOutput },
GT_OreDictUnificator.get(prefixes, Materials.Silicone, 1),
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
@@ -291,7 +289,7 @@ public class ZPMRubberChanges implements Runnable {
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
ZPMRubberChanges.doStacksCointainAndReplace(
- new Object[] {recipe.mOutput},
+ new Object[] { recipe.mOutput },
GT_OreDictUnificator.get(prefixes, Materials.StyreneButadieneRubber, 1),
true,
WerkstoffMaterialPool.PTMEGElastomer.get(prefixes));
@@ -310,7 +308,7 @@ public class ZPMRubberChanges implements Runnable {
true,
WerkstoffMaterialPool.PTMEGElastomer.getMolten(1).getFluid());
}
- if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[] {recipe.mOutput}, stack, false)) {
+ if (ZPMRubberChanges.doStacksCointainAndReplace(new Object[] { recipe.mOutput }, stack, false)) {
ZPMRubberChanges.doStacksCointainAndReplace(
recipe.mFluidInputs,
Materials.StyreneButadieneRubber.getMolten(1),
@@ -335,23 +333,22 @@ public class ZPMRubberChanges implements Runnable {
return stack;
}
- private static boolean doStacksCointainAndReplace(
- FluidStack[] stacks, FluidStack stack, boolean replace, Fluid... replacement) {
+ private static boolean doStacksCointainAndReplace(FluidStack[] stacks, FluidStack stack, boolean replace,
+ Fluid... replacement) {
boolean replaced = false;
for (int i = 0; i < stacks.length; i++) {
- if (GT_Utility.areFluidsEqual(stack, stacks[i]))
- if (!replace) return true;
- else {
- int amount = stacks[i].amount;
- stacks[i] = new FluidStack(replacement[0], amount);
- replaced = true;
- }
+ if (GT_Utility.areFluidsEqual(stack, stacks[i])) if (!replace) return true;
+ else {
+ int amount = stacks[i].amount;
+ stacks[i] = new FluidStack(replacement[0], amount);
+ replaced = true;
+ }
}
return replaced;
}
- private static boolean doStacksCointainAndReplace(
- Object[] stacks, ItemStack stack, boolean replace, ItemStack... replacement) {
+ private static boolean doStacksCointainAndReplace(Object[] stacks, ItemStack stack, boolean replace,
+ ItemStack... replacement) {
// GT_Log.out.print("In doStacksCointainAndReplace!\n");
boolean replaced = false;
for (int i = 0; i < stacks.length; i++) {
@@ -369,13 +366,12 @@ public class ZPMRubberChanges implements Runnable {
}
} else continue;
- } else if (GT_Utility.areStacksEqual(stack, (ItemStack) stacks[i], true))
- if (!replace) return true;
- else {
- int amount = ((ItemStack) stacks[i]).stackSize;
- stacks[i] = BW_Util.setStackSize(replacement[0], amount);
- replaced = true;
- }
+ } else if (GT_Utility.areStacksEqual(stack, (ItemStack) stacks[i], true)) if (!replace) return true;
+ else {
+ int amount = ((ItemStack) stacks[i]).stackSize;
+ stacks[i] = BW_Util.setStackSize(replacement[0], amount);
+ replaced = true;
+ }
}
return replaced;
}
diff --git a/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java b/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
index 222e0de59b..e156b7fab8 100644
--- a/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
+++ b/src/main/java/com/elisis/gtnhlanth/util/DescTextLocalization.java
@@ -5,9 +5,12 @@ import net.minecraft.util.StatCollector;
public class DescTextLocalization {
- public static final String BLUEPRINT_INFO =
- "Follow the" + EnumChatFormatting.BLUE + " Structure" + EnumChatFormatting.DARK_BLUE + "Lib"
- + EnumChatFormatting.GRAY + " hologram projector to build the main structure.";
+ public static final String BLUEPRINT_INFO = "Follow the" + EnumChatFormatting.BLUE
+ + " Structure"
+ + EnumChatFormatting.DARK_BLUE
+ + "Lib"
+ + EnumChatFormatting.GRAY
+ + " hologram projector to build the main structure.";
public static String[] addText(String preFix, int length) {
String[] text = new String[length];
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
index c6977b488a..fab9ff9d65 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/IMC.java
@@ -1,8 +1,9 @@
package com.elisis.gtnhlanth.xmod.nei;
-import cpw.mods.fml.common.event.FMLInterModComms;
import net.minecraft.nbt.NBTTagCompound;
+import cpw.mods.fml.common.event.FMLInterModComms;
+
public class IMC {
public static void IMCSender() {
diff --git a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
index f42c95c530..b5ae4220ac 100644
--- a/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
+++ b/src/main/java/com/elisis/gtnhlanth/xmod/nei/NEI_Config.java
@@ -1,6 +1,7 @@
package com.elisis.gtnhlanth.xmod.nei;
import codechicken.nei.api.IConfigureNEI;
+
import com.elisis.gtnhlanth.Tags;
public class NEI_Config implements IConfigureNEI {
generated by cgit (git 2.46.0) at 2025-03-06 20:46:05 +0000