From 28461486172ce24611b5283e59d3b96e2f42885d Mon Sep 17 00:00:00 2001
From: Jakub <53441451+kuba6000@users.noreply.github.com>
Date: Sat, 1 Apr 2023 15:42:50 +0200
Subject: Fix EIG and EEC energy consumption (#68)

* Deprecate and final modifier to mEUt

* Fix all energy issues

* Update build.gradle

* Update MixinPlugin.java

* Refactoring / Fixes

* Update KubaTechGTMultiBlockBase.java
---
 .../api/implementations/KubaTechGTMultiBlockBase.java | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'src/main/java/kubatech/api/implementations')

diff --git a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
index 732dbba88a..43ce98009d 100644
--- a/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
+++ b/src/main/java/kubatech/api/implementations/KubaTechGTMultiBlockBase.java
@@ -9,6 +9,7 @@ import java.util.function.Function;
 
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
 import net.minecraftforge.fluids.FluidStack;
 
 import com.gtnewhorizons.modularui.api.drawable.IDrawable;
@@ -22,6 +23,7 @@ import com.gtnewhorizons.modularui.common.builder.UIInfo;
 import com.gtnewhorizons.modularui.common.internal.wrapper.ModularGui;
 import com.gtnewhorizons.modularui.common.internal.wrapper.ModularUIContainer;
 
+import gregtech.api.enums.GT_Values;
 import gregtech.api.gui.modularui.GT_UITextures;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.metatileentity.BaseMetaTileEntity;
@@ -30,6 +32,9 @@ import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_ExtendedPow
 public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T>>
         extends GT_MetaTileEntity_ExtendedPowerMultiBlockBase<T> {
 
+    @Deprecated
+    public final int mEUt = 0;
+
     @SuppressWarnings("unchecked")
     protected static <K extends KubaTechGTMultiBlockBase<?>> UIInfo<?, ?> createKTMetaTileEntityUI(
             KTContainerConstructor<K> containerConstructor) {
@@ -160,6 +165,14 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten
         return calculateOverclock(aEUt, aDuration, true);
     }
 
+    public int getVoltageTier() {
+        return (int) getVoltageTierExact();
+    }
+
+    public double getVoltageTierExact() {
+        return Math.log((double) getMaxInputEu() / 8d) / ln4 + 1e-8d;
+    }
+
     @Override
     public boolean isCorrectMachinePart(ItemStack aStack) {
         return true;
@@ -180,7 +193,11 @@ public abstract class KubaTechGTMultiBlockBase<T extends GT_MetaTileEntity_Exten
         return false;
     }
 
-    // ModularUI stuff
+    // UI stuff
+
+    protected static String voltageTooltipFormatted(int tier) {
+        return GT_Values.TIER_COLORS[tier] + GT_Values.VN[tier] + EnumChatFormatting.GRAY;
+    }
 
     protected final Function<Widget, Boolean> isFixed = widget -> getIdealStatus() == getRepairStatus() && mMachine;
     protected static final Function<Integer, IDrawable[]> toggleButtonBackgroundGetter = val -> {
-- 
cgit