From 3b567dbcd27e28ee4243112d8215e331641560ce Mon Sep 17 00:00:00 2001 From: GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> Date: Sat, 24 Dec 2022 06:14:37 +0000 Subject: More DD NEI work --- .../java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java | 7 +++---- .../github/technus/tectech/recipe/EyeOfHarmonyRecipeStorage.java | 5 +---- 2 files changed, 4 insertions(+), 8 deletions(-) (limited to 'src/main') 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> 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> processDD(ArrayList 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 -- cgit