diff options
| author | flame-cat <kaldraganov05@gmail.com> | 2020-12-17 21:02:19 -0500 |
|---|---|---|
| committer | flame-cat <kaldraganov05@gmail.com> | 2020-12-17 21:02:19 -0500 |
| commit | 5df12d316ddefa2b32de9e226168469bfd5a03f9 (patch) | |
| tree | a1c25e0a62c48fa47dc0b50d5fba182529c3303e /src/main/java/me/Danker/DankersSkyblockMod.java | |
| parent | 6f3aceaf037be3e21cf7620cc92b10a07cb115c7 (diff) | |
| parent | 5a796d45211dfc9a7cc0a63a753e638dea9fc96c (diff) | |
| download | SkyblockMod-5df12d316ddefa2b32de9e226168469bfd5a03f9.tar.gz SkyblockMod-5df12d316ddefa2b32de9e226168469bfd5a03f9.tar.bz2 SkyblockMod-5df12d316ddefa2b32de9e226168469bfd5a03f9.zip | |
Merge branch 'development' of https://github.com/bowser0000/SkyblockMod into development
Diffstat (limited to 'src/main/java/me/Danker/DankersSkyblockMod.java')
| -rw-r--r-- | src/main/java/me/Danker/DankersSkyblockMod.java | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java index b55131e..bfd776d 100644 --- a/src/main/java/me/Danker/DankersSkyblockMod.java +++ b/src/main/java/me/Danker/DankersSkyblockMod.java @@ -78,7 +78,7 @@ import java.util.regex.Pattern; public class DankersSkyblockMod { public static final String MODID = "Danker's Skyblock Mod"; - public static final String VERSION = "1.8.5-beta3"; + public static final String VERSION = "1.8.5-beta5"; static double checkItemsNow = 0; static double itemsChecked = 0; @@ -1206,7 +1206,7 @@ public class DankersSkyblockMod public void renderEverything() { if (Minecraft.getMinecraft().currentScreen instanceof EditLocationsGui) return; - + Minecraft mc = Minecraft.getMinecraft(); if (ToggleCommand.coordsToggled) { @@ -2888,6 +2888,13 @@ public class DankersSkyblockMod Blocks.oak_door, Blocks.skull )); + ArrayList<Block> flowerPlaceable = new ArrayList<>(Arrays.asList( + Blocks.grass, + Blocks.dirt, + Blocks.flower_pot, + Blocks.tallgrass, + Blocks.double_plant + )); if (Utils.inDungeons) { interactables.add(Blocks.coal_block); interactables.add(Blocks.stained_hardened_clay); @@ -2900,6 +2907,14 @@ public class DankersSkyblockMod event.setCanceled(true); } } + if(flowerPlaceable.contains(block)){ + if (ToggleCommand.flowerWeaponsToggled && item.getDisplayName().contains("Flower of Truth")) { + event.setCanceled(true); + } + if (ToggleCommand.flowerWeaponsToggled && item.getDisplayName().contains("Spirit Sceptre")) { + event.setCanceled(true); + } + } } } |