aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java4
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java7
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java24
3 files changed, 33 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index c5476f5f89..4ef2e9fa79 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -408,12 +408,12 @@ public class RECIPES_GREGTECH {
GT_Values.NF,
GT_Values.NF,
ELEMENT.getInstance().THORIUM232.getDust(2),
- ELEMENT.getInstance().THORIUM.getDust(5),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallThorium", 20),
ELEMENT.getInstance().URANIUM232.getDust(1),
GT_Values.NI,
GT_Values.NI,
GT_Values.NI,
- new int[]{10000, 10000, 10},
+ new int[]{0, 0, 10},
500*20,
2000);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index 757a46d00d..f9f5f1338b 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -61,6 +61,13 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
}
} else if (aOreDictName.equals(OreDictNames.craftingLensWhite.toString())) {
+ if (ItemUtils.getItemStackOfAmountFromOreDictNoBroken("plateLithium", 1) != null){
+ GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 8L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 4), 6400, 2000);
+ }
+ else {
+ Utils.LOG_INFO("plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
+ Utils.LOG_INFO("This material item can be re-enabled within the gregtech configuration files, If you wish to fix this yourself.");
+ }
}
}
}
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 6f0697365d..337356f1cf 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -105,6 +105,18 @@ public class RecipeGen_DustGeneration implements Runnable{
else {
Utils.LOG_WARNING("144l fluid extractor from 1 Dust Recipe: "+material.getLocalizedName()+" - Failed");
}
+ if (GT_Values.RA.addFluidExtractionRecipe(material.getIngot(1), //Input
+ null, //Input 2
+ material.getFluid(144), //Fluid Output
+ 0, //Chance
+ 1*20, //Duration
+ 16 //Eu Tick
+ )){
+ Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_WARNING("144l fluid extractor from 1 ingot Recipe: "+material.getLocalizedName()+" - Failed");
+ }
if (GT_Values.RA.addFluidExtractionRecipe(material.getPlate(1), //Input
null, //Input 2
material.getFluid(144), //Fluid Output
@@ -117,6 +129,18 @@ public class RecipeGen_DustGeneration implements Runnable{
else {
Utils.LOG_WARNING("144l fluid extractor from 1 plate Recipe: "+material.getLocalizedName()+" - Failed");
}
+ if (GT_Values.RA.addFluidExtractionRecipe(material.getPlateDouble(1), //Input
+ null, //Input 2
+ material.getFluid(288), //Fluid Output
+ 0, //Chance
+ 1*20, //Duration
+ 16 //Eu Tick
+ )){
+ Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_WARNING("144l fluid extractor from 1 double plate Recipe: "+material.getLocalizedName()+" - Failed");
+ }
if (GT_Values.RA.addFluidExtractionRecipe(material.getNugget(1), //Input
null, //Input 2
material.getFluid(16), //Fluid Output