Fix NPE with Volcanus coil level (#727)

* Address deprecations * Fix NPE with Volcanus coil level
GTNewHorizons · Aug 23, 2023 · 6e42400 · 6e42400
1 parent 565ef33
commit 6e42400
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/...tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/...tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java
@@ -191,7 +191,7 @@ protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe re
                         // Need to multiply by 2 because heat OC is done only once every 1800 and this one does it once
                         // every
                         // 900
-                        .setMultiHeat((int) (getCoilLevel().getHeat() * 2));
+                        .setMachineHeat((int) (getCoilLevel().getHeat() * 2));
             }
         }.setMaxParallelSupplier(this::getMaxParallelRecipes);
     }

diff --git a/...n/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/...n/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java
@@ -190,7 +190,7 @@ protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
             @Override
             protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
                 return super.createOverclockCalculator(recipe).setHeatOC(true).setHeatDiscount(true)
-                        .setRecipeHeat(recipe.mSpecialValue).setMultiHeat((int) getCoilLevel().getHeat());
+                        .setRecipeHeat(recipe.mSpecialValue).setMachineHeat((int) getCoilLevel().getHeat());
             }
         }.setSpeedBonus(1F / 2.2F).setEuModifier(0.5F).setMaxParallelSupplier(this::getMaxParallelRecipes);
     }

diff --git a/...ommon/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/...ommon/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java
@@ -61,7 +61,7 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase<
     private int mCasing;
     private final ArrayList<GT_MetaTileEntity_Hatch_CustomFluidBase> mPyrotheumHatches = new ArrayList<>();
 
-    private HeatingCoilLevel mHeatingCapacity;
+    private HeatingCoilLevel mHeatingCapacity = HeatingCoilLevel.None;
 
     public GregtechMetaTileEntity_Adv_EBF(int aID, String aName, String aNameRegional) {
         super(aID, aName, aNameRegional);
@@ -241,7 +241,7 @@ protected CheckRecipeResult validateRecipe(@NotNull GT_Recipe recipe) {
             @Override
             protected GT_OverclockCalculator createOverclockCalculator(@NotNull GT_Recipe recipe) {
                 return super.createOverclockCalculator(recipe).setHeatOC(true).setHeatDiscount(true)
-                        .setRecipeHeat(recipe.mSpecialValue).setMultiHeat((int) getCoilLevel().getHeat());
+                        .setRecipeHeat(recipe.mSpecialValue).setMachineHeat((int) getCoilLevel().getHeat());
             }
         }.setSpeedBonus(1F / 2.2F).setEuModifier(0.9F).setMaxParallelSupplier(this::getMaxParallelRecipes);
     }