From 5934a17d9012f899d01c86eaba9d1c5ba5b49d83 Mon Sep 17 00:00:00 2001 From: Bob Date: Sun, 21 Apr 2024 18:13:25 +0200 Subject: [PATCH] [frantic autism music starts playing] --- README.md | 4 +++- changelog | 6 +++++- src/main/java/api/hbm/energymk2/PowerNetMK2.java | 4 ++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 54734a685..fd29c9084 100644 --- a/README.md +++ b/README.md @@ -4,12 +4,14 @@ [NTM on CurseForge](https://minecraft.curseforge.com/projects/hbms-nuclear-tech-mod?gameCategorySlug=mc-mods&projectID=235439) +[Official NTM Wiki](https://nucleartech.wiki/wiki/Main_Page) + **This is for 1.7.10!** For 1.12, check out these projects: * NTM Reloaded: https://github.com/TheOriginalGolem/Hbm-s-Nuclear-Tech-GIT/releases * NTM Extended Edition (Alcater): https://github.com/Alcatergit/Hbm-s-Nuclear-Tech-GIT/releases -For 1.18, try Martin's remake: https://github.com/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases +For 1.18, try Martin's remake: https://codeberg.org/MartinTheDragon/Nuclear-Tech-Mod-Remake/releases ## Downloading pre-compiled versions from GitHub diff --git a/changelog b/changelog index 324262095..b1b577c15 100644 --- a/changelog +++ b/changelog @@ -10,4 +10,8 @@ ## Fixed * Limited assembler input to up to 10 attempts per ingredient, fixing a rare issue where the assembler freezes the server when pulling items * Fixed fallout effects not loading chunks -* Fixed RBMK steam channel recycling recipe \ No newline at end of file +* Fixed RBMK steam channel recycling recipe +* Rewrote the transfer part of the power system *again* + * The current system is a hybrid of the previous transfer code and the old system + * While a little bit slower than the previous transfer code, it is still much faster than the old system + * This should fix issues caused by order (as order is now entirely irrelevant, just like with the old system) as well as issues caused by buffers wasting transfer capacity doing nothing \ No newline at end of file diff --git a/src/main/java/api/hbm/energymk2/PowerNetMK2.java b/src/main/java/api/hbm/energymk2/PowerNetMK2.java index b10c928d6..ffb1ee64c 100644 --- a/src/main/java/api/hbm/energymk2/PowerNetMK2.java +++ b/src/main/java/api/hbm/energymk2/PowerNetMK2.java @@ -171,6 +171,8 @@ public class PowerNetMK2 { toTransfer -= energyUsed; } + + this.energyTracker += energyUsed; for(Pair entry : providers) { double weight = (double) entry.getValue() / (double) powerAvailable; @@ -330,6 +332,8 @@ public class PowerNetMK2 { toTransfer -= energyUsed; } + this.energyTracker += energyUsed; + return power - energyUsed; }