aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2019-03-28 15:20:32 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-03-28 15:20:32 +1000
commit49010b5511dce4228d6e5ef6cf790d83e88c0a59 (patch)
treea948462e4a5ec7835162b88de68cdeb73f51f6fe /src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
parentf93d9fb323a5aee2ed5c30320998f26bc177d707 (diff)
downloadGT5-Unofficial-49010b5511dce4228d6e5ef6cf790d83e88c0a59.tar.gz
GT5-Unofficial-49010b5511dce4228d6e5ef6cf790d83e88c0a59.tar.bz2
GT5-Unofficial-49010b5511dce4228d6e5ef6cf790d83e88c0a59.zip
% Rebalanced all auto-generated material machine recipes to use the correct voltages. Closes #428
$ Re-added Additional output %'s for Multiblocks. $ Fixed Lathe recipes not giving two small dusts. Closes #449 $ Greatly improved flexibility of Multiblock recipe handling.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index ecdc3af1db..461ac256f4 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -47,7 +47,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
}
private void generateRecipes(final Material material, final boolean disableOptional){
- final int tVoltageMultiplier = material.getMeltingPointK() >= 2800 ? 60 : 15;
+ final int tVoltageMultiplier = material.vVoltageMultiplier;
Logger.WARNING("Generating Shaped Crafting recipes for "+material.getLocalizedName()); //TODO
@@ -212,7 +212,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
null,
outputStacks,
(int) Math.max(material.getMass() * 2L * 1, 1),
- 2 * material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example.
+ material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example.
{
Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
}
@@ -318,7 +318,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
null,
outputStacks,
(int) Math.max(material.getMass() * 2L * 1, 1),
- 2 * material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example.
+ material.vVoltageMultiplier)) //Was 6, but let's try 2. This makes Potin LV, for example.
{
Logger.WARNING("Dust Mixer Recipe: "+material.getLocalizedName()+" - Success");
return true;
@@ -421,7 +421,7 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (aSlot < 2) {
aSlot = 2;
}
- long aVoltage = MaterialUtils.getVoltageForTier(aSlot);
+ long aVoltage = aMatInfo.vVoltageMultiplier;
return GT_Values.RA.addBlastRecipe(
input1,