diff options
| author | miozune <miozune@gmail.com> | 2023-08-23 15:32:01 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-23 08:32:01 +0200 |
| commit | 6e4240016f3b00efeeec2d1c5308628a46cf5b14 (patch) | |
| tree | ddc676ee7cf7c8ff0398928dd5ba5d6a94bc2a75 | |
| parent | 565ef33c14f8f39e9f347f532609f2053309110c (diff) | |
| download | GT5-Unofficial-6e4240016f3b00efeeec2d1c5308628a46cf5b14.tar.gz GT5-Unofficial-6e4240016f3b00efeeec2d1c5308628a46cf5b14.tar.bz2 GT5-Unofficial-6e4240016f3b00efeeec2d1c5308628a46cf5b14.zip | |
Fix NPE with Volcanus coil level (#727)
* Address deprecations
* Fix NPE with Volcanus coil level
3 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java index 44d154f757..c6fbc3e3c3 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialAlloySmelter.java @@ -191,7 +191,7 @@ public class GregtechMetaTileEntity_IndustrialAlloySmelter extends // 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/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java index 61782003ce..805468d4d4 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/GregtechMetaTileEntity_IndustrialDehydrator.java @@ -190,7 +190,7 @@ public class GregtechMetaTileEntity_IndustrialDehydrator extends @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/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java b/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java index 001c3624f9..a17b1c70c1 100644 --- a/src/main/java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/processing/advanced/GregtechMetaTileEntity_Adv_EBF.java +++ b/src/main/java/gtPlusPlus/xmod/gregtech/common/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 @@ public class GregtechMetaTileEntity_Adv_EBF extends GregtechMeta_MultiBlockBase< @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); } |