From 676ee2ca5ad1de111d3fb68e2db19f9d6ea720db Mon Sep 17 00:00:00 2001
From: My-Name-Is-Jeff <37018278+My-Name-Is-Jeff@users.noreply.github.com>
Date: Thu, 17 Dec 2020 19:16:40 -0500
Subject: Manually merge changes from development

---
 src/main/java/me/Danker/DankersSkyblockMod.java | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'src/main/java/me/Danker/DankersSkyblockMod.java')

diff --git a/src/main/java/me/Danker/DankersSkyblockMod.java b/src/main/java/me/Danker/DankersSkyblockMod.java
index 7acf51d..7f9d57c 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;
@@ -1305,7 +1305,7 @@ public class DankersSkyblockMod
     
     public void renderEverything() {
     	if (Minecraft.getMinecraft().currentScreen instanceof EditLocationsGui) return;
-    	
+
     	Minecraft mc = Minecraft.getMinecraft();
     	
     	if (ToggleCommand.coordsToggled) {
@@ -3041,10 +3041,25 @@ 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);
 			}
+			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);
+				}
+			}
 			if (!interactables.contains(block)) {
 				if (ToggleCommand.aotdToggled && item.getDisplayName().contains("Aspect of the Dragons")) {
 					event.setCanceled(true);
-- 
cgit