diff options
| author | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-01-29 03:53:27 +0000 |
|---|---|---|
| committer | GTNH-Colen <54497873+GTNH-Colen@users.noreply.github.com> | 2023-01-29 03:53:27 +0000 |
| commit | 891bb290ea9f4d41694b7e6a8b82f19f41cacb11 (patch) | |
| tree | 83bb4d664370382ba4e44d3518833d60a1c983f8 | |
| parent | f6e626fd73fec71a0fb5cb290926975f5dae7b45 (diff) | |
| download | GT5-Unofficial-891bb290ea9f4d41694b7e6a8b82f19f41cacb11.tar.gz GT5-Unofficial-891bb290ea9f4d41694b7e6a8b82f19f41cacb11.tar.bz2 GT5-Unofficial-891bb290ea9f4d41694b7e6a8b82f19f41cacb11.zip | |
Correct index + new material integration.
3 files changed, 30 insertions, 5 deletions
diff --git a/dependencies.gradle b/dependencies.gradle index b4f477555e..851b61d84c 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -2,7 +2,7 @@ dependencies { shadowImplementation('com.github.GTNewHorizons:AVRcore:1.0.1') - compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.251-pre:dev") + compile("com.github.GTNewHorizons:GT5-Unofficial:5.09.41.258-pre:dev") compile('com.github.GTNewHorizons:ModularUI:1.0.38:dev') compile('com.github.GTNewHorizons:Yamcl:0.5.84:dev') compile('com.github.GTNewHorizons:NotEnoughItems:2.3.20-GTNH:dev') 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 5f5a73c71c..3c3220928a 100644 --- a/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java +++ b/src/main/java/com/github/technus/tectech/recipe/EyeOfHarmonyRecipe.java @@ -126,9 +126,34 @@ public class EyeOfHarmonyRecipe { } // Add a bonus fluid of compressed star matter. - // todo replace with Bonus star matter when added to GT5. fluidStackArrayList.add(Materials.RawStarMatter.getFluid((this.spacetimeCasingTierRequired + 1) * 100_000)); + // Tier 0 - 576 White + // Tier 1 - 2304 White + // Tier 2 - 9216 White + // Tier 3 - 36864 White + + // Tier 4 - 576 Black + // Tier 5 - 2304 Black + // Tier 6 - 9216 Black + // Tier 7 - 36864 Black + + // Tier 8 - 576 Universium + // Tier 9 - 2304 Universium + + if (rocketTierOfRecipe <= 3) { + fluidStackArrayList.add(Materials.WhiteDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe - 1))); + } + + if ((4 <= rocketTierOfRecipe) && (rocketTierOfRecipe <= 7)) { + fluidStackArrayList.add(Materials.BlackDwarfMatter.getMolten(576L * pow(4, (int) rocketTierOfRecipe))); + } + + if (rocketTierOfRecipe >= 8) { + fluidStackArrayList.add(Materials.Universium.getMolten(576L * pow(4, (int) (rocketTierOfRecipe - 8)))); + } + + outputFluids = fluidStackArrayList; // End fluid processing. @@ -229,7 +254,7 @@ public class EyeOfHarmonyRecipe { private static final double QUATERNARY_MULTIPLIER = (0.7); // Mercury/chem bath processing chance. private static final double[] ORE_MULTIPLIER = { - PRIMARY_MULTIPLIER, SECONDARY_MULTIPLIER, TERTIARY_MULTIPLIER, QUATERNARY_MULTIPLIER + PRIMARY_MULTIPLIER, SECONDARY_MULTIPLIER, TERTIARY_MULTIPLIER, QUATERNARY_MULTIPLIER }; public static class HashMapHelper extends HashMap<Materials, Double> { diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java index 539ec3de9c..781c1cc5d1 100644 --- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java +++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java @@ -1286,9 +1286,9 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl 'H', buildHatchAdder(GT_MetaTileEntity_EM_EyeOfHarmony.class) .atLeast(InputHatch, OutputHatch, OutputBus, Maintenance) - .casingIndex(13) + .casingIndex(texturePage << 7) .dot(1) - .buildAndChain(sBlockCasingsBA0, 13)) + .buildAndChain(sBlockCasingsBA0, 12)) .addElement( 'E', ofBlocksTiered( |