Improved VFP overclock efficiency with quadratic scaling

CHANGELOG.md

@@ -1,5 +1,6 @@
 # 2.6.3
 - Re: Fix Disable Helmet AutoEat Mixin [#349](https://github.com/GTModpackTeam/GTExpert-Core/pull/349)
+- Improved VFP overclock efficiency with quadratic scaling [#350](https://github.com/GTModpackTeam/GTExpert-Core/pull/350)
 
 * * *
 

src/main/java/com/github/gtexpert/core/common/metatileentities/multi/MetaTileEntityVoidFluidPump.java

@@ -186,6 +186,15 @@ protected void addDisplayText(List<ITextComponent> textList) {
                 .addEnergyUsageLine(energyContainer)
                 .addCustom(tl -> {
                     if (isStructureFormed()) {
+                        // Production multiplier info
+                        ITextComponent multiplierInfo = TextComponentUtil.stringWithColor(
+                                TextFormatting.AQUA,
+                                getOverclockMultiplier() + "x");
+                        tl.add(TextComponentUtil.translationWithColor(
+                                TextFormatting.GRAY,
+                                "gtexpert.multiblock.void_fluid_pump.multiplier",
+                                multiplierInfo));
+
                         if (minerLogic.getDrilledFluid() != null) {
                             // Fluid name
                             Fluid drilledFluid = minerLogic.getDrilledFluid();
@@ -244,6 +253,7 @@ public void addInformation(ItemStack stack, @Nullable World world, @NotNull List
         tooltip.add(I18n.format("gtexpert.machine.void_fluid_pump.tooltip.2", GTValues.VNF[getBaseTier()],
                 getBaseMultiplier()));
         tooltip.add(I18n.format("gtexpert.machine.void_fluid_pump.tooltip.3"));
+        tooltip.add(I18n.format("gtexpert.machine.void_fluid_pump.tooltip.overclock"));
     }
 
     @Override
@@ -261,8 +271,13 @@ public int getBaseMultiplier() {
         return GTEConfigHolder.gteFlag.vfpBaseProductionRate;
     }
 
+    public int getOverclockMultiplier() {
+        int tierDiff = Math.max(0, getEnergyTier() - getBaseTier());
+        return (tierDiff + 1) * (tierDiff + 1);
+    }
+
     public int getRigMultiplier() {
-        return Math.max(1, getBaseMultiplier() * (getEnergyTier() - getBaseTier()));
+        return getBaseMultiplier() * getOverclockMultiplier();
     }
 
     @Override

src/main/java/com/github/gtexpert/core/mixins/gregtech/GTRecipeWrapperMixin.java → src/main/java/com/github/gtexpert/core/mixins/draconicevolution/GTRecipeWrapperMixin.java

@@ -1,4 +1,4 @@
-package com.github.gtexpert.core.mixins.gregtech;
+package com.github.gtexpert.core.mixins.draconicevolution;
 
 import java.util.Map;
 

src/main/resources/assets/gtexpert/lang/en_us.lang

@@ -33,8 +33,9 @@ gtexpert.machine.large_transformer.tooltip.1=Simplified version of active transf
 gtexpert.machine.large_transformer.tooltip.2=§dAuthor:§f @MrKono
 gtexpert.machine.void_fluid_pump.name=Void Fluid Pump
 gtexpert.machine.void_fluid_pump.tooltip.1=Infinite Oil Deposit
-gtexpert.machine.void_fluid_pump.tooltip.2=For every voltage tier above §b%s§7, Production Multiplier is §e%dx§7.
+gtexpert.machine.void_fluid_pump.tooltip.2=Base production multiplier at §b%s§7 tier: §e%dx§7
 gtexpert.machine.void_fluid_pump.tooltip.3=§dAuthor:§f @MrKono
+gtexpert.machine.void_fluid_pump.tooltip.overclock=§aQuadratic Overclock:§7 Higher tiers are more efficient (e.g., +1 tier = 4x, +2 = 9x, +3 = 16x)
 
 # singleblock
 # Auto Chisel
@@ -255,6 +256,7 @@ gtexpert.multiblock.large_transformer.max_output_energy_per_tick_amps=Max Output
 gtexpert.multiblock.large_transformer.not_enough_input=Max Output exceeds Max Input!
 gtexpert.multiblock.void_ore_miner.ender_pearl_amount=Ender Pearl: %s
 gtexpert.multiblock.void_ore_miner.drilling_fluid_amount=Drilling Fluid: %s
+gtexpert.multiblock.void_fluid_pump.multiplier=Production Multiplier: %s
 
 #config
 gtexpert.config.gtexpert=GTExpert-Core

src/main/resources/assets/gtexpert/lang/ja_jp.lang

@@ -33,8 +33,9 @@ gtexpert.machine.large_transformer.tooltip.1=大型変圧器の簡易版
 gtexpert.machine.large_transformer.tooltip.2=§d作者:§f @MrKono
 gtexpert.machine.void_fluid_pump.name=亜空間型液体ポンプ
 gtexpert.machine.void_fluid_pump.tooltip.1=無限の油田
-gtexpert.machine.void_fluid_pump.tooltip.2=使用電圧が§b%s§7よりも高い場合、電圧Tier毎に生産量が§e%d倍§7になる。
+gtexpert.machine.void_fluid_pump.tooltip.2=§b%s§7ティアでの基本生産倍率: §e%d倍§7
 gtexpert.machine.void_fluid_pump.tooltip.3=§d作者:§f @MrKono
+gtexpert.machine.void_fluid_pump.tooltip.overclock=§a二次オーバークロック:§7 高ティアほど効率向上 (例: +1ティア = 4倍, +2 = 9倍, +3 = 16倍)
 
 # singleblock
 # Auto Chisel
@@ -255,3 +256,4 @@ gtexpert.multiblock.large_transformer.max_output_energy_per_tick_amps=最大出
 gtexpert.multiblock.large_transformer.not_enough_input=最大出力が最大入力を超過している!
 gtexpert.multiblock.void_ore_miner.ender_pearl_amount=エンダーパール: %s
 gtexpert.multiblock.void_ore_miner.drilling_fluid_amount=採掘油: %s
+gtexpert.multiblock.void_fluid_pump.multiplier=生産倍率: %s

src/main/resources/mixins.gtexpert.draconicevolution.json

@@ -10,5 +10,6 @@
   "server": [
   ],
   "client": [
+    "GTRecipeWrapperMixin"
   ]
 }

src/main/resources/mixins.gtexpert.gregtech.json

@@ -10,6 +10,5 @@
   "server": [
   ],
   "client": [
-    "GTRecipeWrapperMixin"
   ]
 }