diff --git a/src/main/java/com/jelly/MightyMiner/config/Config.java b/src/main/java/com/jelly/MightyMiner/config/Config.java index 2d60cb7f..15816cdc 100644 --- a/src/main/java/com/jelly/MightyMiner/config/Config.java +++ b/src/main/java/com/jelly/MightyMiner/config/Config.java @@ -139,17 +139,21 @@ public class Config extends cc.polyfrost.oneconfig.config.Config { public boolean powAutosell = false; @VigilanceName(name = "Mithril macro priority 1", category = MITHRIL_MACRO, subcategory = "Mining") - @Dropdown(name = "Mithril macro priority 1", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool"}, size = 2) + @Dropdown(name = "Mithril macro priority 1", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool", "Titanium"}, size = 2) public int mithPriority1 = 1; @VigilanceName(name = "Mithril macro priority 2", category = MITHRIL_MACRO, subcategory = "Mining") - @Dropdown(name = "Mithril macro priority 2", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool"}, size = 2) + @Dropdown(name = "Mithril macro priority 2", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool", "Titanium"}, size = 2) public int mithPriority2 = 2; @VigilanceName(name = "Mithril macro priority 3", category = MITHRIL_MACRO, subcategory = "Mining") - @Dropdown(name = "Mithril macro priority 3", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool"}, size = 2) + @Dropdown(name = "Mithril macro priority 3", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool", "Titanium"}, size = 2) public int mithPriority3 = 0; + @VigilanceName(name = "Mithril macro priority 4", category = MITHRIL_MACRO, subcategory = "Mining") + @Dropdown(name = "Mithril macro priority 4", category = MITHRIL_MACRO, subcategory = "Mining", options = { "Clay / Gray Wool", "Prismarine", "Blue Wool", "Titanium"}, size = 2) + public int mithPriority4 = 0; + @VigilanceName(name = "Shift when mining", category = MITHRIL_MACRO, subcategory = "Miscellaneous") @Switch(name = "Shift when mining", category = MITHRIL_MACRO, subcategory = "Miscellaneous") public boolean mithShiftWhenMine = true; diff --git a/src/main/java/com/jelly/MightyMiner/macros/macros/MithrilMacro.java b/src/main/java/com/jelly/MightyMiner/macros/macros/MithrilMacro.java index f9a3305c..7b1c39c4 100644 --- a/src/main/java/com/jelly/MightyMiner/macros/macros/MithrilMacro.java +++ b/src/main/java/com/jelly/MightyMiner/macros/macros/MithrilMacro.java @@ -35,10 +35,11 @@ protected void onEnable() { } mithPriorityList.clear(); - //mithPriorityList.addAll(BlockUtils.addData(new ArrayList(){{add((Block) Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.DIORITE));}})); +// mithPriorityList.addAll(BlockUtils.addData(new ArrayList(){{add((Block) Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.DIORITE_SMOOTH));}})); mithPriorityList.addAll(MineUtils.getMithrilColorBasedOnPriority(MightyMiner.config.mithPriority1)); mithPriorityList.addAll(MineUtils.getMithrilColorBasedOnPriority(MightyMiner.config.mithPriority2)); mithPriorityList.addAll(MineUtils.getMithrilColorBasedOnPriority(MightyMiner.config.mithPriority3)); + mithPriorityList.addAll(MineUtils.getMithrilColorBasedOnPriority(MightyMiner.config.mithPriority4)); baritone = new AutoMineBaritone(getMineBehaviour()); } diff --git a/src/main/java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java b/src/main/java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java index a04051e0..2b31dd07 100644 --- a/src/main/java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java +++ b/src/main/java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java @@ -2,6 +2,7 @@ import com.jelly.MightyMiner.MightyMiner; import com.jelly.MightyMiner.utils.BlockUtils.BlockData; +import net.minecraft.block.BlockStone; import net.minecraft.init.Blocks; import net.minecraft.item.EnumDyeColor; @@ -34,6 +35,11 @@ public static ArrayList> getMithrilColorBasedOnPriority( return new ArrayList>() {{ add(new BlockData<>(Blocks.wool, EnumDyeColor.LIGHT_BLUE)); }}; + case 3: + return new ArrayList>() {{ + add(new BlockData<>(Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.DIORITE).getBlock(), null)); + add(new BlockData<>(Blocks.stone.getDefaultState().withProperty(BlockStone.VARIANT, BlockStone.EnumType.DIORITE_SMOOTH).getBlock(), null)); + }}; default: return null; }