diff options
| author | minecraft7771 <maxim235@gmx.de> | 2023-03-31 22:02:20 +0200 |
|---|---|---|
| committer | minecraft7771 <maxim235@gmx.de> | 2023-03-31 22:02:20 +0200 |
| commit | 40c466e95d061f891b1fe3034f79869d5ae98220 (patch) | |
| tree | 79a2cc67baf4e1d7056a46f35bb6b7e1ca90b4c8 | |
| parent | bdf64584ccf40fb36325e9968ab3abe047ac7166 (diff) | |
| download | GT5-Unofficial-40c466e95d061f891b1fe3034f79869d5ae98220.tar.gz GT5-Unofficial-40c466e95d061f891b1fe3034f79869d5ae98220.tar.bz2 GT5-Unofficial-40c466e95d061f891b1fe3034f79869d5ae98220.zip | |
Override getActualEnergyUsage so it still works with old TT machines
| -rw-r--r-- | layout.json | 13 | ||||
| -rw-r--r-- | src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/base/GT_MetaTileEntity_MultiblockBase_EM.java | 5 |
2 files changed, 18 insertions, 0 deletions
diff --git a/layout.json b/layout.json new file mode 100644 index 0000000000..17299c1304 --- /dev/null +++ b/layout.json @@ -0,0 +1,13 @@ +{ + "ideaDirPath": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea", + "modulesMap": { + "TecTech": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.iml", + "TecTech:mcLauncher": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.mcLauncher.iml", + "TecTech:patchedMc": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.patchedMc.iml", + "TecTech:test": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.test.iml", + "TecTech:injectedTags": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.injectedTags.iml", + "TecTech:main": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.main.iml", + "TecTech:api": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.api.iml", + "TecTech:ideVirtualMain": "C:/Users/maxim/Desktop/GTNH-Workspace/TecTech/.idea/modules/TecTech.ideVirtualMain.iml" + } +}
\ No newline at end of file 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) |