aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus
diff options
context:
space:
mode:
authorchochem <40274384+chochem@users.noreply.github.com>2024-08-23 20:58:50 +0100
committerGitHub <noreply@github.com>2024-08-23 19:58:50 +0000
commitf89d122ce4492281981140fd9e1612cea08313cf (patch)
tree69117f6e4ed08f692bc5994d155ccf4a9202ebfc /src/main/java/gtPlusPlus
parent56c98aa0ca2ccab586abe13e3064b1e3499731ec (diff)
downloadGT5-Unofficial-f89d122ce4492281981140fd9e1612cea08313cf.tar.gz
GT5-Unofficial-f89d122ce4492281981140fd9e1612cea08313cf.tar.bz2
GT5-Unofficial-f89d122ce4492281981140fd9e1612cea08313cf.zip
Cleaner abs recipe duration calc (#2949)
* fix broken file * cleanup tier and duration for abs recipes --------- Co-authored-by: Martin Robertz <dream-master@gmx.net>
Diffstat (limited to 'src/main/java/gtPlusPlus')
-rw-r--r--src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
index 583da105b5..bcf2565b39 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/loaders/RecipeGen_BlastSmelter.java
@@ -1,5 +1,6 @@
package gtPlusPlus.xmod.gregtech.loaders;
+import static gregtech.api.enums.GT_Values.VP;
import static gregtech.api.recipe.RecipeMaps.fluidSolidifierRecipes;
import static gtPlusPlus.api.recipe.GTPPRecipeMaps.alloyBlastSmelterRecipes;
@@ -29,7 +30,6 @@ import gtPlusPlus.core.material.nuclear.NUCLIDE;
import gtPlusPlus.core.material.state.MaterialState;
import gtPlusPlus.core.util.minecraft.FluidUtils;
import gtPlusPlus.core.util.minecraft.ItemUtils;
-import gtPlusPlus.core.util.minecraft.MaterialUtils;
public class RecipeGen_BlastSmelter extends RecipeGen_Base {
@@ -76,13 +76,14 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
// This Bad boy here is what dictates unique recipes.
ItemStack circuitGT;
- long aVoltage = MaterialUtils.getVoltageForTier(M.vTier);
+ int tier = Math.max(1, M.vTier);
+ long aVoltage = VP[tier];
// Set a duration
- int duration = 120 * M.vTier * 10;
+ int duration = 120 * tier * 10;
- if (M.vTier <= 4) {
- duration = 20 * M.vTier * 10;
+ if (tier <= 4) {
+ duration = 20 * tier * 10;
}
int mMaterialListSize = 0;
@@ -99,11 +100,6 @@ public class RecipeGen_BlastSmelter extends RecipeGen_Base {
mMaterialListSize = 1;
}
- if (duration <= 0) {
- final int second = 20;
- duration = 14 * second * mMaterialListSize * 8;
- }
-
Logger.WARNING("[BAS] Size: " + mMaterialListSize);
// Make a simple one Material MaterialStack[] and log it for validity.