aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMartin Robertz <dream-master@gmx.net>2022-06-24 19:09:10 +0200
committerGitHub <noreply@github.com>2022-06-24 19:09:10 +0200
commit3d7f22c6663999bf8b885d4546763babeac50531 (patch)
tree474a9c67bc58c54340cfd03cc3f3d6b50b914227 /src
parentd55742a1059709601d782e55e763698ac6152fdc (diff)
downloadGT5-Unofficial-3d7f22c6663999bf8b885d4546763babeac50531.tar.gz
GT5-Unofficial-3d7f22c6663999bf8b885d4546763babeac50531.tar.bz2
GT5-Unofficial-3d7f22c6663999bf8b885d4546763babeac50531.zip
Kevlar (#177)
* Add ACETIC ANHYDRIDE recipe alternative for KEvlar Line * fix recipe (cherry picked from commit 690483d9881f1ff776599680de0cc6040da7e5f1) * change Nitrobenze name (cherry picked from commit 298e0825041281d7fdf756bbda1f3af04b3a0778)
Diffstat (limited to 'src')
-rw-r--r--src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java4
-rw-r--r--src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java36
2 files changed, 25 insertions, 15 deletions
diff --git a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
index bb7edec42e..baeda0ee59 100644
--- a/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
+++ b/src/main/java/gtPlusPlus/core/item/chemistry/GenericChem.java
@@ -191,7 +191,7 @@ public class GenericChem extends ItemPackage {
Benzene = FluidRegistry.getFluid("benzene");
}
- NitroBenzene = FluidUtils.generateFluidNoPrefix("nitrobenzene", "NitroBenzene", 278, new short[] { 70, 50, 40, 100 }, true);
+ NitroBenzene = FluidUtils.generateFluidNoPrefix("nitrobenzene", "Nitrobenzene", 278, new short[] { 70, 50, 40, 100 }, true);
Aniline = FluidUtils.generateFluidNoPrefix("aniline", "Aniline", 266, new short[] { 100, 100, 30, 100 }, true);
@@ -490,7 +490,7 @@ public class GenericChem extends ItemPackage {
// Burnables
// Gas Fuels
- GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellNitroBenzene", 1), null, 1250, 1);
+ GT_Values.RA.addFuel(ItemUtils.getItemStackOfAmountFromOreDict("cellNitrobenzene", 1), null, 1250, 1);
}
diff --git a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 6974461866..e3570f43cf 100644
--- a/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/main/java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -1,16 +1,14 @@
package gtPlusPlus.core.recipe;
-import static gtPlusPlus.core.lib.CORE.GTNH;
-
-import java.util.ArrayList;
-
-import advsolar.common.AdvancedSolarPanel;
import cpw.mods.fml.common.Loader;
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 gregtech.api.util.GT_ModHandler;
+import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.HotFuel;
+import gregtech.api.util.ThermalFuel;
import gtPlusPlus.api.objects.Logger;
import gtPlusPlus.core.block.ModBlocks;
import gtPlusPlus.core.item.ModItems;
@@ -22,11 +20,7 @@ import gtPlusPlus.core.item.crafting.ItemDummyResearch;
import gtPlusPlus.core.item.crafting.ItemDummyResearch.ASSEMBLY_LINE_RESEARCH;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.core.material.ALLOY;
-import gtPlusPlus.core.material.ELEMENT;
-import gtPlusPlus.core.material.MISC_MATERIALS;
-import gtPlusPlus.core.material.ORES;
-import gtPlusPlus.core.material.Particle;
+import gtPlusPlus.core.material.*;
import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.Utils;
@@ -44,6 +38,10 @@ import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
+import java.util.ArrayList;
+
+import static gtPlusPlus.core.lib.CORE.GTNH;
+
public class RECIPES_GREGTECH {
public static void run() {
@@ -1352,9 +1350,21 @@ public class RECIPES_GREGTECH {
5 * 20,
180);
}
-
+ //Alternative ACETIC ANHYDRIDE recipe for Kevlar Line
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[] {
+ CI.getNumberedAdvancedCircuit(18),
+ CI.emptyCells(1)
+ },
+ FluidUtils.getFluidStack("aceticacid", 2000),
+ MISC_MATERIALS.ACETIC_ANHYDRIDE.getFluidStack(1000),
+ new ItemStack[] {
+ ItemUtils.getItemStackOfAmountFromOreDict("cellWater", 1),
+ },
+ new int[] {10000},
+ 30 * 20,
+ 480);
}
-
private static void largeChemReactorRecipes() {
//Styrene
CORE.RA.addMultiblockChemicalRecipe(