aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/core/recipe
diff options
context:
space:
mode:
authorJordan Byrne <draknyte1@hotmail.com>2018-01-30 04:00:48 +1000
committerJordan Byrne <draknyte1@hotmail.com>2018-01-30 04:00:48 +1000
commitb5ba6067230047ba6ab797f977b1d7c2e77deb6d (patch)
treeb55f5250141c349d9945b4b142de94a21d15265c /src/Java/gtPlusPlus/core/recipe
parent18bc6994e7c371565007ed5dbdf79300d7025ff7 (diff)
downloadGT5-Unofficial-b5ba6067230047ba6ab797f977b1d7c2e77deb6d.tar.gz
GT5-Unofficial-b5ba6067230047ba6ab797f977b1d7c2e77deb6d.tar.bz2
GT5-Unofficial-b5ba6067230047ba6ab797f977b1d7c2e77deb6d.zip
+ Added recipe to craft the Activated Alkalus Disk.
+ Added recipe to craft Mystic Frame portal blocks. % Tweaked Toxic Everglades Portal. % Tweaked sludge textures. $ Stopped Mining Explosive using CSPRNG.
Diffstat (limited to 'src/Java/gtPlusPlus/core/recipe')
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java38
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_General.java18
-rw-r--r--src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java7
3 files changed, 54 insertions, 9 deletions
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
index 536fa47cd7..3f1b0b16ba 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_GREGTECH.java
@@ -63,9 +63,25 @@ public class RECIPES_GREGTECH {
advancedMixerRecipes();
sifterRecipes();
electroMagneticSeperatorRecipes();
+ extruderRecipes();
addFuels();
}
+ private static void extruderRecipes() {
+ //Osmium Credits
+ if (GT_Values.RA.addExtruderRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("blockOsmium", 4),
+ ItemList.Shape_Mold_Credit.get(0),
+ ItemList.Credit_Greg_Osmium.get(0),
+ (int) Math.max(Materials.Osmium.getMass() * 2L * 1, 1),
+ 4 * Materials.Osmium.mDensityMultiplier)){
+ Logger.WARNING("Extruder Recipe: Osmium Credit - Success");
+ }
+ else {
+ Logger.WARNING("Extruder Recipe: Osmium Credit - Failed");
+ }
+ }
+
private static void blastSmelterRecipes() {
//Black Bronze
@@ -1166,7 +1182,7 @@ public class RECIPES_GREGTECH {
}
private static void electroMagneticSeperatorRecipes(){
- //Bauxite
+ //Zirconium
GT_Values.RA.addElectromagneticSeparatorRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedBauxite", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustBauxite", 1),
@@ -1174,17 +1190,15 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("nuggetZirconium", 1),
new int[]{10000, 2500, 4000},
20*20,
- 24);
+ 24);
-
-
//Trinium
GT_Values.RA.addElectromagneticSeparatorRecipe(
ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedNaquadah", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustNaquadah", 1),
- ItemUtils.getItemStackOfAmountFromOreDict("dustSmallEnrichedNaquadah", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallNaquadahEnriched", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[]{10000, 2500, 4000},
+ new int[]{10000, 2500, 5000},
20*20,
24);
@@ -1194,7 +1208,17 @@ public class RECIPES_GREGTECH {
ItemUtils.getItemStackOfAmountFromOreDict("dustIridium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallOsmium", 1),
ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
- new int[]{10000, 2500, 4000},
+ new int[]{10000, 2500, 5000},
+ 20*20,
+ 24);
+
+ //Trinium
+ GT_Values.RA.addElectromagneticSeparatorRecipe(
+ ItemUtils.getItemStackOfAmountFromOreDict("crushedPurifiedWulfenite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustWulfenite", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
+ ItemUtils.getItemStackOfAmountFromOreDict("dustSmallTrinium", 1),
+ new int[]{10000, 3000, 3000},
20*20,
24);
}
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
index 6bbe28dd6e..4112be2687 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_General.java
@@ -14,6 +14,7 @@ import gtPlusPlus.core.material.nuclear.FLUORIDES;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.item.ItemUtils;
import gtPlusPlus.core.util.recipe.RecipeUtils;
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
import gtPlusPlus.xmod.bop.blocks.BOP_Block_Registrator;
import net.minecraft.init.Blocks;
import net.minecraft.init.Items;
@@ -103,8 +104,6 @@ public class RECIPES_General {
Logger.INFO("Added a recipe for Rainforest oak Saplings.");
}
-
-
//Iron bars
final ItemStack ironBars;
if (CORE.GTNH) {
@@ -132,6 +131,21 @@ public class RECIPES_General {
}
+ //Set Shards
+ ItemStack shardAer = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Air Shard", 0, 1);
+ ItemStack shardIgnis = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Fire Shard", 1, 1);
+ ItemStack shardAqua = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Warer Shard", 2, 1);
+ ItemStack shardTerra = ItemUtils.getItemStackWithMeta(LoadedMods.Thaumcraft, "Thaumcraft:ItemShard", "Earth Shard", 3, 1);
+
+ //Mystic Frame
+ if (RecipeUtils.recipeBuilder(
+ shardAer, shardIgnis, shardAqua,
+ shardTerra, "gemRuby", shardTerra,
+ shardAqua, shardIgnis, shardAer,
+ ItemUtils.getSimpleStack(Dimension_DarkWorld.blockPortalFrame))){
+ Logger.INFO("Added a recipe for the Toxic Everglades Portal frame");
+ }
+
//Alkalus Coin
if (RecipeUtils.recipeBuilder(
"gemExquisiteRuby", "gemFlawlessDiamond", "gemExquisiteDiamond",
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
index 889af1753d..e76e517808 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_LaserEngraver.java
@@ -5,8 +5,10 @@ import gregtech.api.interfaces.IOreRecipeRegistrator;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GT_Utility;
import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.item.ModItems;
import gtPlusPlus.core.lib.CORE;
import gtPlusPlus.core.util.item.ItemUtils;
+import gtPlusPlus.core.world.darkworld.Dimension_DarkWorld;
import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
import net.minecraft.item.ItemStack;
@@ -120,6 +122,11 @@ public class RECIPES_LaserEngraver implements IOreRecipeRegistrator {
}
+
+ else if (aOreDictName.equals(OreDictNames.craftingLensOrange.toString())) {
+ GT_Values.RA.addLaserEngraverRecipe(ItemUtils.getSimpleStack(ModItems.itemAlkalusDisk), GT_Utility.copyAmount(0L, new Object[]{aStack}), ItemUtils.getSimpleStack(Dimension_DarkWorld.portalItem), 360*60*20, 4096);
+ }
+
}