aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus
diff options
context:
space:
mode:
Diffstat (limited to 'src/Java/gtPlusPlus')
-rw-r--r--src/Java/gtPlusPlus/core/item/ModItems.java4
-rw-r--r--src/Java/gtPlusPlus/core/material/Material.java9
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java56
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java28
5 files changed, 78 insertions, 21 deletions
diff --git a/src/Java/gtPlusPlus/core/item/ModItems.java b/src/Java/gtPlusPlus/core/item/ModItems.java
index 2f0d9969a1..a8cac86065 100644
--- a/src/Java/gtPlusPlus/core/item/ModItems.java
+++ b/src/Java/gtPlusPlus/core/item/ModItems.java
@@ -146,7 +146,7 @@ public final class ModItems {
public static Item dustQuicklime;
public static Item dustCalciumHydroxide;
public static Item dustCalciumCarbonate;
- public static Item dust2LiOH_CaCO3;
+ public static Item dustLi2CO3CaOH2;
public static Item dustLi2BeF4;
public static Item dustAer;
@@ -378,7 +378,7 @@ public final class ModItems {
}
dustCalciumHydroxide = ItemUtils.generateSpecialUseDusts("CalciumHydroxide", "Hydrated Lime", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_hydroxide
dustCalciumCarbonate = ItemUtils.generateSpecialUseDusts("CalciumCarbonate", "Calcium Carbonate", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
- dust2LiOH_CaCO3 = ItemUtils.generateSpecialUseDusts("2LiOHCaCO3", "2LiOH & CaCO3 Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
+ dustLi2CO3CaOH2 = ItemUtils.generateSpecialUseDusts("Li2CO3CaOH2", "Li2CO3 + Ca(OH)2 Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/Calcium_carbonate
//FLiBe Fuel Compounds
dustLi2BeF4 = ItemUtils.generateSpecialUseDusts("Li2BeF4", "Li2BeF4 Fuel Compound", Utils.rgbtoHexValue(255, 255, 255))[0]; //https://en.wikipedia.org/wiki/FLiBe
diff --git a/src/Java/gtPlusPlus/core/material/Material.java b/src/Java/gtPlusPlus/core/material/Material.java
index a91ad41c4e..0ff2037c99 100644
--- a/src/Java/gtPlusPlus/core/material/Material.java
+++ b/src/Java/gtPlusPlus/core/material/Material.java
@@ -11,6 +11,7 @@ import gtPlusPlus.core.util.math.MathUtils;
import java.util.ArrayList;
+import net.minecraft.block.Block;
import net.minecraft.item.Item;
import net.minecraft.item.ItemStack;
import net.minecraftforge.fluids.Fluid;
@@ -229,6 +230,14 @@ public class Material {
final public boolean requiresBlastFurnace(){
return usesBlastFurnace;
}
+
+ final public Block getBlock(){
+ return Block.getBlockFromItem(ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+unlocalizedName, 1).getItem());
+ }
+
+ final public ItemStack getBlock(int stacksize){
+ return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("block"+unlocalizedName, stacksize);
+ }
final public ItemStack getDust(int stacksize){
return ItemUtils.getItemStackOfAmountFromOreDictNoBroken("dust"+unlocalizedName, stacksize);
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 4ef2e9fa79..9ae25b841d 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -122,20 +122,22 @@ public class RECIPES_GREGTECH {
private static void dehydratorRecipes(){
Utils.LOG_INFO("Loading Recipes for Chemical Dehydrator.");
- /*try {
-
+ try {
//Makes Lithium Carbonate
CORE.RA.addDehydratorRecipe(
- FluidUtils.getFluidStack("sulfuriclithium", 1000), //Item input (slot 1)
- null, //Fluid Input
+ ItemUtils.getItemStackOfAmountFromOreDict("cellSulfuricLithium", 1), //Item Input
+ FluidUtils.getFluidStack("sulfuriclithium", 440), //Fluid input (slot 1)
new ItemStack[]{
- UtilsItems.getItemStackOfAmountFromOreDict("dustSodium", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustCarbon", 1),
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 1)
+ ItemUtils.getItemStackOfAmountFromOreDict("cellEmpty", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSulfur", 3),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCopper", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSodium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustCarbon", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 3)
}, //Output Array of Items - Upto 9
- 10*20, //Time in ticks
+ 30*20, //Time in ticks
30); //EU
- }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}*/
+ }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
try {
ItemStack cells = ItemUtils.getItemStackWithMeta(LoadedMods.IndustrialCraft2, "IC2:itemCellEmpty", "Empty Fluid Cells", 0, 12);
@@ -239,7 +241,7 @@ public class RECIPES_GREGTECH {
CORE.RA.addDehydratorRecipe(
new ItemStack[]{
- ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 5)
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 5)
}, //Item input (Array, up to 2)
null, //Fluid input (slot 1)
null, //Fluid output (slot 2)
@@ -253,6 +255,24 @@ public class RECIPES_GREGTECH {
}catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+ //LiOH Liquid to Dust
+ try {
+
+ CORE.RA.addDehydratorRecipe(
+ new ItemStack[]{
+ ItemUtils.getGregtechCircuit(0)
+ }, //Item input (Array, up to 2)
+ FluidUtils.getFluidStack("lithiumhydroxide", 144), //Fluid input (slot 1)
+ null, //Fluid output (slot 2)
+ new ItemStack[]{
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithiumHydroxide", 1)
+ }, //Output Array of Items - Upto 9,
+ new int[]{0},
+ 1*20, //Time in ticks
+ 64); //EU
+
+ }catch (NullPointerException e){Utils.LOG_INFO("FAILED TO LOAD RECIPES - NULL POINTER SOMEWHERE");}
+
//Zirconium Chloride -> TetraFluoride
try {
@@ -431,7 +451,7 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustCalciumHydroxide", 5), //Input Stack 2
null, //Fluid Input
null, //Fluid Output
- ItemUtils.getItemStackOfAmountFromOreDict("dust2LiOHCaCO3", 10), //Output Stack
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLi2CO3CaOH2", 10), //Output Stack
600*20
);
@@ -452,17 +472,17 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallSulfur", 1),
20*20);
- /*GT_Values.RA.addChemicalRecipe(
- UtilsItems.getItemStackOfAmountFromOreDict("dustLithium", 8),
+ GT_Values.RA.addChemicalRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 1),
null,
- FluidUtils.getFluidStack("sulfuricacid", 133*32),
- FluidUtils.getFluidStack("sulfuriclithium", 133*4),
- UtilsItems.getItemStackOfAmountFromOreDict("dustSmallLithium", 2),
- 20*20);*/
+ FluidUtils.getFluidStack("sulfuricacid", 144*8),
+ FluidUtils.getFluidStack("sulfuriclithium", 144*2),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallLithium7", 1),
+ 20*20);
GT_Values.RA.addChemicalRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("cellOxygen", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustLithium", 16),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustLithium7", 16),
FluidUtils.getFluidStack("water", 1000),
FluidUtils.getFluidStack("lithiumhydroxide", 144*4),
null,
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index f9f5f1338b..9346e0b05f 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -62,7 +62,7 @@ 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);
+ GT_Values.RA.addLaserEngraverRecipe(GT_OreDictUnificator.get(OrePrefixes.plate, Materials.Lithium, 26L), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getItemStackOfAmountFromOreDict("plateDoubleLithium7", 13), 600*20, 2000);
}
else {
Utils.LOG_INFO("plateLithium does not exist within Gregtech, please report this issue to Blood-asp on github.");
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 337356f1cf..857ce8013d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -2,6 +2,7 @@ package gtPlusPlus.xmod.gregtech.loaders;
import gregtech.api.enums.GT_Values;
import gregtech.api.enums.ItemList;
+import gregtech.api.util.GT_ModHandler;
import gtPlusPlus.core.material.Material;
import gtPlusPlus.core.util.Utils;
import gtPlusPlus.core.util.item.ItemUtils;
@@ -153,6 +154,18 @@ public class RecipeGen_DustGeneration implements Runnable{
else {
Utils.LOG_WARNING("16l fluid extractor from 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");
}
+ if (GT_Values.RA.addFluidExtractionRecipe(material.getBlock(1), //Input
+ null, //Input 2
+ material.getFluid(144*9), //Fluid Output
+ 0, //Chance
+ 1*20, //Duration
+ 16 //Eu Tick
+ )){
+ Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_WARNING((144*9)+"l fluid extractor from 1 block Recipe: "+material.getLocalizedName()+" - Failed");
+ }
//Making Shapes from fluid
if (GT_Values.RA.addFluidSolidifierRecipe(
@@ -191,7 +204,22 @@ public class RecipeGen_DustGeneration implements Runnable{
else {
Utils.LOG_WARNING("16l fluid molder for 1 nugget Recipe: "+material.getLocalizedName()+" - Failed");
}
+ if (GT_Values.RA.addFluidSolidifierRecipe(
+ ItemList.Shape_Mold_Block.get(1), //Item Shape
+ material.getFluid(144*9), //Fluid Input
+ material.getBlock(1), //output
+ 1*20, //Duration
+ 16 //Eu Tick
+ )){
+ Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Success");
+ }
+ else {
+ Utils.LOG_WARNING((144*9)+"l fluid molder from 1 block Recipe: "+material.getLocalizedName()+" - Failed");
+ }
+ //Macerate blocks back to dusts.
+ GT_ModHandler.addPulverisationRecipe(material.getBlock(1), material.getDust(9));
+
//Is this a composite?
if (inputStacks != null){
//Is this a composite?
generated by cgit (git 2.46.0) at 2025-03-10 15:21:08 +0000