From c0606a4f058a886f25cdadfcdc5fd8f039bbe811 Mon Sep 17 00:00:00 2001
From: Sampsa <69092953+S4mpsa@users.noreply.github.com>
Date: Wed, 11 Sep 2024 22:48:21 +0300
Subject: Various turbine fixes (#3147)

Co-authored-by: Martin Robertz <dream-master@gmx.net>
---
 .../multi/production/turbines/MTELargerTurbineBase.java  |  5 -----
 .../production/turbines/MTELargerTurbinePlasma.java      | 16 +++-------------
 2 files changed, 3 insertions(+), 18 deletions(-)

(limited to 'src/main/java/gtPlusPlus/xmod/gregtech/common')

diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
index 079983e337..08261e7d9c 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbineBase.java
@@ -654,11 +654,6 @@ public abstract class MTELargerTurbineBase extends GTPPMultiBlockBase<MTELargerT
                 + GTUtility.formatNumbers(mPollutionReduction)
                 + EnumChatFormatting.RESET
                 + " %" };
-        if (!aIsSteam) ret[4] = StatCollector.translateToLocal("GT5U.turbine.flow") + ": "
-            + EnumChatFormatting.YELLOW
-            + GTUtility.formatNumbers(MathUtils.safeInt((long) realOptFlow))
-            + EnumChatFormatting.RESET
-            + " L/t";
         return ret;
     }
 
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
index 9947cc6350..2fa2c1aed9 100644
--- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
+++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/production/turbines/MTELargerTurbinePlasma.java
@@ -1,10 +1,8 @@
 package gtPlusPlus.xmod.gregtech.common.tileentities.machines.multi.production.turbines;
 
 import java.util.ArrayList;
-import java.util.HashSet;
 
 import net.minecraft.item.ItemStack;
-import net.minecraftforge.fluids.Fluid;
 import net.minecraftforge.fluids.FluidRegistry;
 import net.minecraftforge.fluids.FluidStack;
 
@@ -19,7 +17,6 @@ import gregtech.api.recipe.RecipeMap;
 import gregtech.api.recipe.RecipeMaps;
 import gregtech.api.recipe.check.CheckRecipeResult;
 import gregtech.api.recipe.check.CheckRecipeResultRegistry;
-import gregtech.api.recipe.check.SimpleCheckRecipeResult;
 import gregtech.api.recipe.maps.FuelBackend;
 import gregtech.api.util.GTRecipe;
 import gregtech.api.util.GTUtility;
@@ -32,8 +29,6 @@ import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock;
 @SuppressWarnings("deprecation")
 public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
 
-    private static final HashSet<Fluid> BLACKLIST = new HashSet<>();
-
     public MTELargerTurbinePlasma(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
     }
@@ -131,11 +126,6 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
             ArrayList<FluidStack> tFluids = getStoredFluids();
 
             if (tFluids.size() > 0) {
-                for (FluidStack fluid : tFluids) {
-                    if (fluid != null && BLACKLIST.contains(fluid.getFluid())) {
-                        return SimpleCheckRecipeResult.ofFailure("fuel_blacklisted");
-                    }
-                }
                 if (baseEff == 0 || optFlow == 0
                     || counter >= 512
                     || this.getBaseMetaTileEntity()
@@ -191,10 +181,10 @@ public class MTELargerTurbinePlasma extends MTELargerTurbineBase {
 
             long difference = newPower - this.lEUt; // difference between current output and new output
 
-            // Magic numbers: can always change by at least 10 eu/t, but otherwise by at most 1 percent of the
-            // difference in power level (per tick)
+            // Magic numbers: can always change by at least 200 eu/s, but otherwise by at most 20 percent of the
+            // difference in power level (per second)
             // This is how much the turbine can actually change during this tick
-            int maxChangeAllowed = Math.max(10, GTUtility.safeInt((long) Math.abs(difference) / 100));
+            int maxChangeAllowed = Math.max(200, GTUtility.safeInt((long) Math.abs(difference) / 5));
 
             if (Math.abs(difference) > maxChangeAllowed) { // If this difference is too big, use the maximum allowed
                 // change
-- 
cgit