aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-07-06 03:51:44 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-07-06 03:51:44 +1000
commit1b3cc3bcba3cd2ce2b4c461c115b739e6e454a2c (patch)
treec2553e3a11246083f5eaa1c69cdc62acc710d432 /src/Java/gtPlusPlus/xmod/gregtech/loaders
parent91a1d710bae0d50fdd3694f21907fa54a3916152 (diff)
downloadGT5-Unofficial-1b3cc3bcba3cd2ce2b4c461c115b739e6e454a2c.tar.gz
GT5-Unofficial-1b3cc3bcba3cd2ce2b4c461c115b739e6e454a2c.tar.bz2
GT5-Unofficial-1b3cc3bcba3cd2ce2b4c461c115b739e6e454a2c.zip
$ Fixed most recipe generation issues, now it's highly optimized.
$ Fixed issue where custom Rings had a crafting recipe using a wrench and a rod.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java13
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java2
2 files changed, 1 insertions, 14 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index 52a3c914b6..1875e874ea 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -45,19 +45,6 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15;
Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
- //Ring Recipe
-
- if (RecipeUtils.addShapedGregtechRecipe(
- "craftingToolWrench", null, null,
- null, material.getRod(1), null,
- null, null, null,
- material.getRing(1))){
- Logger.WARNING("Ring Recipe: "+material.getLocalizedName()+" - Success");
- }
- else {
- Logger.WARNING("Ring Recipe: "+material.getLocalizedName()+" - Failed");
- }
-
final ItemStack normalDust = material.getDust(1);
final ItemStack smallDust = material.getSmallDust(1);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
index fce4bad318..df50f6c7d7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_ShapedCrafting.java
@@ -93,7 +93,7 @@ public class RecipeGen_ShapedCrafting extends RecipeGen_Base {
//Ring Recipe
if (!material.isRadioactive && material.getRing(1) != null){
- if (LoadedMods.DreamCraft){
+ if (CORE.GTNH){
if (RecipeUtils.recipeBuilder(
"craftingToolHardHammer", null, null,
"craftingToolFile", material.getRod(1), null,