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-01-07 16:59:22 +0000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2019-01-07 16:59:22 +0000
commitf5c94fb03a6a0558fc42853fcde7fe17a2eb98c6 (patch)
treed46935d5ee50ad148daf0bd0a6cafa94188df1bb /src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
parent05d2066fd364ddff525b9ac4b38771d196641a5e (diff)
downloadGT5-Unofficial-f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6.tar.gz
GT5-Unofficial-f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6.tar.bz2
GT5-Unofficial-f5c94fb03a6a0558fc42853fcde7fe17a2eb98c6.zip
+ Added several new Materials and Alloys. (Nitinol 60, Adv. Nitinol, Hypogen, Titansteel, Arcanite, Octiron, Tungsten Titanium Carbide, Astral Titanium, Celestial Tungsten, Chronomatic Glass).
+ Added Carbon nanotubes, Carbyne and associated materials required to create them. + Added Hypervisor Matrix (Fusion), a core component for the MK4. % Tweaked recipes for the MK4 Fusion Reactor and components, making it significantly harder. $ Fixed some base elements not generating correctly due to inverted logic for detection. $ Fixed rare chance for an invalid compressor recipe to generate. $ Fixed Voltages and tiering of all materials, resolves many recipe issues within the EBF and ABS. $ Fixed invalid compound tooltips on all ore materials.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
index d4051ff8bf..ebf5aecd99 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_DustGeneration.java
@@ -20,6 +20,7 @@ import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.recipe.common.CI;
import gtPlusPlus.core.util.math.MathUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.core.util.minecraft.MaterialUtils;
import gtPlusPlus.core.util.minecraft.RecipeUtils;
import net.minecraftforge.fluids.FluidStack;
@@ -416,11 +417,11 @@ public class RecipeGen_DustGeneration extends RecipeGen_Base {
if (aMatInfo.vTier <= 4){
timeTaken = 25*aMatInfo.vTier*10;
}
- int aSlot = aMatInfo.vTier - 1;
+ int aSlot = aMatInfo.vTier;
if (aSlot < 2) {
aSlot = 2;
}
- long aVoltage = GT_Values.V[aSlot >= 2 ? aSlot : 2];
+ long aVoltage = MaterialUtils.getVoltageForTier(aSlot);
return GT_Values.RA.addBlastRecipe(
input1,