From f119621c3fb2c69c23fde0c25a56eaeb614c3598 Mon Sep 17 00:00:00 2001 From: NK Date: Tue, 28 Feb 2023 22:26:54 +0000 Subject: [PATCH 1/2] adding titanium to config so it can be mined(third time as i accidentally removed it last time) --- src/main/java/com/jelly/MightyMiner/config/Config.java | 10 +++++++--- .../jelly/MightyMiner/macros/macros/MithrilMacro.java | 3 ++- .../MightyMiner/utils/HypixelUtils/MineUtils.java | 5 +++++ 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/jelly/MightyMiner/config/Config.java b/src/main/java/com/jelly/MightyMiner/config/Config.java index 361cf2ba..672906b3 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 d2552ab6..c761ce05 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..9306e5f9 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,10 @@ 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)); + }}; default: return null; } From ac1692cb18eb07fa2b191a15f1730e23f0b74794 Mon Sep 17 00:00:00 2001 From: NK Date: Thu, 2 Mar 2023 13:49:09 +0000 Subject: [PATCH 2/2] for the sake of it as idk when hypixel have other variants of stone --- .../java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java | 1 + 1 file changed, 1 insertion(+) 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 9306e5f9..2b31dd07 100644 --- a/src/main/java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java +++ b/src/main/java/com/jelly/MightyMiner/utils/HypixelUtils/MineUtils.java @@ -38,6 +38,7 @@ public static ArrayList> getMithrilColorBasedOnPriority( 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;