diff options
| author | GDCloud <gdcloudstrike@gmail.com> | 2023-04-22 00:37:56 +0200 |
|---|---|---|
| committer | GDCloud <gdcloudstrike@gmail.com> | 2023-04-22 00:37:56 +0200 |
| commit | 25f603e1a87134397dd7626b9b93c540d100e4c0 (patch) | |
| tree | 80d61e2da749c64e78840fcd4dcb97faaeca517e /src/main | |
| parent | 452c36d1d4ff812f0fcc536cbc048ce549b0998e (diff) | |
| download | GT5-Unofficial-25f603e1a87134397dd7626b9b93c540d100e4c0.tar.gz GT5-Unofficial-25f603e1a87134397dd7626b9b93c540d100e4c0.tar.bz2 GT5-Unofficial-25f603e1a87134397dd7626b9b93c540d100e4c0.zip | |
fix formula
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_EM_EyeOfHarmony.java | 31 |
1 files changed, 22 insertions, 9 deletions
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 a9259018ac..64eeb63a9a 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 @@ -80,7 +80,7 @@ import gregtech.common.tileentities.machines.GT_MetaTileEntity_Hatch_Output_ME; public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_MultiblockBase_EM implements IConstructable, IGlobalWirelessEnergy, ISurvivalConstructable { - public static final boolean EOH_DEBUG_MODE = false; + public static final boolean EOH_DEBUG_MODE = true; private static final long MOLTEN_SPACETIME_PER_FAILURE_TIER = 14_400L; private static final double SPACETIME_FAILURE_BASE = 2; private static final String TOOLTIP_BAR = GOLD @@ -104,6 +104,8 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl private String userUUID = ""; private long euOutput = 0; + private long startEU = 0; + @Override public int survivalConstruct(ItemStack stackSize, int elementBudget, IItemSource source, EntityPlayerMP actor) { if (mMachine) return -1; @@ -1126,10 +1128,10 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl return false; } + startEU = recipeObject.getEUStartCost(); + // Remove EU from the users network. - if (!addEUToGlobalEnergyMap( - userUUID, - (long) (-recipeObject.getEUStartCost() * pow(4, currentCircuitMultiplier)))) { + if (!addEUToGlobalEnergyMap(userUUID, (long) (-startEU * pow(4, currentCircuitMultiplier)))) { return false; } @@ -1259,6 +1261,7 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl userUUID, (long) (euOutput * (1 - ((TOTAL_CASING_TIERS_WITH_POWER_PENALTY - stabilisationFieldMetadata) * STABILITY_INCREASE_PROBABILITY_DECREASE_YIELD_PER_TIER)))); + startEU = 0; euOutput = 0; if (successChance < random()) { @@ -1336,7 +1339,14 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl str.add(GOLD + "---------------------- Other Stats ---------------"); str.add("Recipe Success Chance: " + RED + formatNumbers(100 * successChance) + RESET + "%"); str.add("Recipe Yield: " + RED + formatNumbers(100 * recipeYieldCalculator()) + RESET + "%"); - str.add("EU Output: " + RED + formatNumbers(euOutput) + RESET + " EU"); + str.add( + "EU Output: " + RED + + formatNumbers( + euOutput * (1 + - ((TOTAL_CASING_TIERS_WITH_POWER_PENALTY - stabilisationFieldMetadata) + * STABILITY_INCREASE_PROBABILITY_DECREASE_YIELD_PER_TIER))) + + RESET + + " EU"); if (mOutputFluids.length > 0) { // Star matter is always the last element in the array. str.add( @@ -1345,13 +1355,16 @@ public class GT_MetaTileEntity_EM_EyeOfHarmony extends GT_MetaTileEntity_Multibl + RESET + " L"); } - long euPerTick = euOutput / maxProgresstime(); - if (euPerTick < LongMath.pow(10, 12)) { - str.add("Estimated EU/t: " + RED + formatNumbers(euOutput / maxProgresstime()) + RESET + " EU/t"); + long euPerTick = (long) -(startEU * pow(4, currentCircuitMultiplier) + - euOutput * (1 - ((TOTAL_CASING_TIERS_WITH_POWER_PENALTY - stabilisationFieldMetadata) + * STABILITY_INCREASE_PROBABILITY_DECREASE_YIELD_PER_TIER))) + / maxProgresstime(); + if (abs(euPerTick) < LongMath.pow(10, 12)) { + str.add("Estimated EU/t: " + RED + formatNumbers(euPerTick) + RESET + " EU/t"); } else { str.add( "Estimated EU/t: " + RED - + ReadableNumberConverter.INSTANCE.toWideReadableForm(euOutput / maxProgresstime()) + + ReadableNumberConverter.INSTANCE.toWideReadableForm(euPerTick) + RESET + " EU/t"); } |