From 5507b8c0e7b2117a33dfb1fedbd14b3c30f6a01b Mon Sep 17 00:00:00 2001
From: Alkalus <3060479+draknyte1@users.noreply.github.com>
Date: Tue, 5 Feb 2019 20:02:33 +0000
Subject: + Added recipe for Nano Healer. + Added recipe for Strange Dust. +
 Added recipe for Slow Builders Ring. + Added recipes for Charge Packs. +
 Added recipes to make obtaining Zirconium a little earlier. + Added packager
 recipes for all ore materials. + Added lathe recipes for all materials ->
 rods. Closes #411. + Added way to process Silicon Carbide into Synthetic
 Graphite. Closes #407. + Added proper achievement localization for all new AL
 recipes. + Added more INIT_PHASE's. - Removed ways to obtain Trinium dust in
 GTNH. (Leave handling to GT instead). % Adjusted recipes for Cyclotron and
 Casings, it's now assembled instead of shape crafted. % Adjusted circuits
 used in lower tier dehydrator recipes for consistency. Closes #364. %
 Adjusted a few materials having '-' in their name within en_US.lang. %
 Adjusted power capacity of the Gem Batteries. % Adjusted tiering for Large
 Auto-Assembler, it has been reduced by one. % Adjusted composition of
 Pikyonium to now require Yttrium, instead of the rare Ytterbium. % Adjusted
 composition of DEEP_EARTH_REACTOR_FUEL_DEPOSIT to be slightly more balanced.
 % Adjusted smelting point of Zirconium Carbide. $ Fixed an NPE in
 GeneralTooltipEventHandler.java. $ Fixed weird invisible recipes. Closes
 #304. $ Confirmed Large Mixer is now working correctly. Closes #366. (Closed
 in previous commit
 https://github.com/draknyte1/GTplusplus/commit/918d763dabd82d47db739a1b0a51c01f0803adc0).
 $ Confirmed Matter Fabricator is now working correctly. Closes #360.

+ Auto Doors. Closes #338. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/22c6a05a8a3a00294bcb8890a1e2a0fdc9196de8).
% Changed Energy Buffer Recipes. Closes #52. (Closed in previous commit https://github.com/draknyte1/GTplusplus/commit/499411aa21ac4a742b6d51ef3ce9c4046d0a22c1).
$ Invalid Recipe. Closes #241. (Closed in unknown, previous commit).
---
 .../core/item/base/rods/BaseItemRod.java           | 30 ++++++++++++++++------
 .../core/item/base/screws/BaseItemScrew.java       |  4 +--
 2 files changed, 24 insertions(+), 10 deletions(-)

(limited to 'src/Java/gtPlusPlus/core/item')

diff --git a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
index b6a5dff2ac..eaa0905c93 100644
--- a/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
+++ b/src/Java/gtPlusPlus/core/item/base/rods/BaseItemRod.java
@@ -14,22 +14,36 @@ public class BaseItemRod extends BaseItemComponent{
 	public BaseItemRod(final Material material) {
 		super(material, BaseItemComponent.ComponentTypes.ROD);
 		this.addExtruderRecipe();
+		this.addLatheRecipe();
 	}
 
 
 	private void addExtruderRecipe(){
 		Logger.WARNING("Adding cutter recipe for "+this.materialName+" Rods");
-
 		final ItemStack stackStick = this.componentMaterial.getRod(1);
 		final ItemStack stackBolt = this.componentMaterial.getBolt(4);
-
+		
 		if (ItemUtils.checkForInvalidItems(new ItemStack[] {stackStick, stackBolt}))
-		GT_Values.RA.addCutterRecipe(
-				stackStick,
-				stackBolt,
-				null,
-				(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
-				4);
+			GT_Values.RA.addCutterRecipe(
+					stackStick,
+					stackBolt,
+					null,
+					(int) Math.max(this.componentMaterial.getMass() * 2L, 1L),
+					4);
+	}
+
+
+	private void addLatheRecipe(){
+		Logger.WARNING("Adding recipe for "+this.materialName+" Rod");
+		ItemStack boltStack = this.componentMaterial.getIngot(1);
+		if (ItemUtils.checkForInvalidItems(boltStack)){
+			GT_Values.RA.addLatheRecipe(
+					boltStack,
+					ItemUtils.getSimpleStack(this),
+					null,
+					(int) Math.max(this.componentMaterial.getMass() / 8L, 1L),
+					4);
+		}
 	}
 
 }
diff --git a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
index af74c1d535..29e525ed10 100644
--- a/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
+++ b/src/Java/gtPlusPlus/core/item/base/screws/BaseItemScrew.java
@@ -18,8 +18,8 @@ public class BaseItemScrew extends BaseItemComponent{
 
 	private void addLatheRecipe(){
 		Logger.WARNING("Adding recipe for "+this.materialName+" Screws");
-		final ItemStack boltStack = ItemUtils.getItemStackOfAmountFromOreDict(this.unlocalName.replace("itemScrew", "bolt"), 1);
-		if (null != boltStack){
+		ItemStack boltStack = this.componentMaterial.getBolt(1);
+		if (ItemUtils.checkForInvalidItems(boltStack)){
 			GT_Values.RA.addLatheRecipe(
 					boltStack,
 					ItemUtils.getSimpleStack(this),
-- 
cgit