From 132b71f4a16b199f919c00f22cbe14399e9a6e9b Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Mon, 8 Jul 2019 22:51:10 -0400 Subject: [PATCH] Closes #1269 --- .../mod/config/values/ConfigIntValues.java | 9 ++++++++- .../actuallyadditions/mod/items/lens/LensMining.java | 7 +++---- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java index 64ece6f2d..0803b7025 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigIntValues.java @@ -98,7 +98,14 @@ public enum ConfigIntValues { 9, 1, Integer.MAX_VALUE, - "The size of the farmer's farming area. Default is 9x9, must be an odd number."); + "The size of the farmer's farming area. Default is 9x9, must be an odd number."), + MINING_LENS_USE( + "Mining Lens Energy", + ConfigCategories.MACHINE_VALUES, + 60000, + 1, + Integer.MAX_VALUE, + "The energy use of the Atomic Reconstructor's Mining Lens."); public final String name; public final String category; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java index 7e548e2a0..fa789f540 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/lens/LensMining.java @@ -17,6 +17,7 @@ import de.ellpeck.actuallyadditions.api.internal.IAtomicReconstructor; import de.ellpeck.actuallyadditions.api.lens.Lens; import de.ellpeck.actuallyadditions.api.recipe.WeightedOre; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigIntValues; import de.ellpeck.actuallyadditions.mod.config.values.ConfigStringListValues; import de.ellpeck.actuallyadditions.mod.recipe.CrusherRecipeRegistry; import de.ellpeck.actuallyadditions.mod.util.StackUtil; @@ -37,8 +38,6 @@ import net.minecraftforge.oredict.OreDictionary; public class LensMining extends Lens { - public static final int ENERGY_USE = 60000; - public static void init() { ActuallyAdditionsAPI.addMiningLensStoneOre("oreCoal", 5000); ActuallyAdditionsAPI.addMiningLensNetherOre("oreNetherCoal", 5000); @@ -124,8 +123,8 @@ public class LensMining extends Lens { @Override public boolean invoke(IBlockState hitState, BlockPos hitPos, IAtomicReconstructor tile) { if (!tile.getWorldObject().isAirBlock(hitPos)) { - if (tile.getEnergy() >= ENERGY_USE) { - int adaptedUse = ENERGY_USE; + if (tile.getEnergy() >= ConfigIntValues.MINING_LENS_USE.getValue()) { + int adaptedUse = ConfigIntValues.MINING_LENS_USE.getValue(); List ores = null; Block hitBlock = hitState.getBlock();