aboutsummaryrefslogtreecommitdiff
path: root/src/main
diff options
context:
space:
mode:
authorGTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>2022-12-24 06:14:37 +0000
committerGTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com>2022-12-24 06:14:37 +0000
commit3b567dbcd27e28ee4243112d8215e331641560ce (patch)
tree720631dff4a7c16324c8dd7fd752fc9c99d36536 /src/main
parent4df907e5419a0ee34f805c777f219a35c4ee52ce (diff)
downloadGT5-Unofficial-3b567dbcd27e28ee4243112d8215e331641560ce.tar.gz
GT5-Unofficial-3b567dbcd27e28ee4243112d8215e331641560ce.tar.bz2
GT5-Unofficial-3b567dbcd27e28ee4243112d8215e331641560ce.zip
More DD NEI work
Diffstat (limited to 'src/main')
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java7
-rw-r--r--src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java5
2 files changed, 4 insertions, 8 deletions
diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
index 93d18723c7..5d6a81c2e1 100644
--- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
+++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java
@@ -144,7 +144,7 @@ public class EyeOfHarmonyRecipe {
// Process recipes output items.
// 6 * 64 = 6 stacks/second for VM tier 3 + Og gas.
- this(processDimension(normalOreDimensionWrapper, smallOreDimensionWrapper, miningTimeSeconds, 6 * 64),
+ this(processDimension(normalOreDimensionWrapper, smallOreDimensionWrapper, miningTimeSeconds),
block,
recipeEnergyEfficiency,
hydrogenRequirement,
@@ -245,11 +245,10 @@ public class EyeOfHarmonyRecipe {
private static ArrayList<Pair<Materials, Long>> processDimension(
GT5OreLayerHelper.NormalOreDimensionWrapper normalOreDimWrapper,
GT5OreSmallHelper.SmallOreDimensionWrapper smallOreDimWrapper,
- long timeInSeconds,
- long miningMultiplier) {
+ long timeInSeconds) {
HashMapHelper outputMap = new HashMapHelper();
- double mainMultiplier = timeInSeconds * miningMultiplier;
+ double mainMultiplier = timeInSeconds * 384.0;
normalOreDimWrapper.oreVeinToProbabilityInDimension.forEach((veinInfo, probability) -> {
processHelper(outputMap, veinInfo.mPrimaryVeinMaterial, mainMultiplier, probability);
diff --git a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java
index 7ae9f0a069..a9a1d6e98b 100644
--- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java
+++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java
@@ -134,7 +134,7 @@ public class EyeOfHarmonyRecipeStorage {
private ArrayList<Pair<Materials, Long>> processDD(ArrayList<Materials> validMaterialList) {
EyeOfHarmonyRecipe.HashMapHelper outputMap = new EyeOfHarmonyRecipe.HashMapHelper();
- // 9 from rocketTier + 1;
+ // 9 from rocketTier + 1, 6 * 64 = VM3 + Og, 1.4 = time increase per tier.
double mainMultiplier = (18_000L * pow(1.4, 9) * (6 * 64));
double probability = 1.0 / validMaterialList.size();
@@ -146,9 +146,6 @@ public class EyeOfHarmonyRecipeStorage {
outputMap.forEach((material, quantity) -> outputList.add(Pair.of(material, (long) Math.floor(quantity))));
-// Collections.sort(outputList);
-// Collections.reverse(outputList);
-
return outputList;
}
} \ No newline at end of file