aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/com
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/java/com')
-rw-r--r--src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java5
-rw-r--r--src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java5
2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
index ac0a8cfdd4..54c72a2da5 100644
--- a/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/compatibility/dreamcraft/DreamCraftRecipeLoader.java
@@ -5557,8 +5557,7 @@ public class DreamCraftRecipeLoader {
getModItem("avaritiaddons", "InfinityChest", absoluteTier + 1),
// Cosmic fabric manipulator
getModItem("miscutils", "gtplusplus.blockcasings.5", tier, 8), ME_Singularity,
- ME_Singularity, ME_Singularity, plateList[absoluteTier],
- getItemContainer("QuantumCircuit").get(set) },
+ ME_Singularity, plateList[absoluteTier], getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier] },
CustomItemList.SpacetimeCompressionFieldGeneratorTier1.get(1),
@@ -5582,7 +5581,7 @@ public class DreamCraftRecipeLoader {
getModItem("avaritiaddons", "InfinityChest", absoluteTier + 1),
// Cosmic fabric manipulator
getModItem("miscutils", "gtplusplus.blockcasings.5", tier, 8), ME_Singularity,
- ME_Singularity, ME_Singularity, ME_Singularity, plateList[absoluteTier],
+ ME_Singularity, ME_Singularity, plateList[absoluteTier],
getItemContainer("QuantumCircuit").get(set) },
new FluidStack[] { new FluidStack(solderUEV, (int) (2_880 * pow(2L, absoluteTier))),
Materials.Space.getMolten(1_440 * (absoluteTier + 1)), specialFluid[absoluteTier], },
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
index 5fd10633f4..0fc4df1266 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java
@@ -680,6 +680,11 @@ public abstract class GT_MetaTileEntity_MultiblockBase_EM
}
}
+ @Override
+ protected long getActualEnergyUsage() {
+ return -(useLongPower ? lEUt : mEUt) * eAmpereFlow * 10_000 / Math.max(1_000, mEfficiency);
+ }
+
/**
* Extra hook on cyclic updates (not really needed for machines smaller than 1 chunk) BUT NEEDED WHEN - machine
* blocks are not touching each other or they don't implement IMachineBlockUpdateable (ex. air,stone,weird TE's)