Fix Botania and Thaumcraft shovels being interrupted by tilling

Roadhog360 · Nov 4, 2024 · 915623e · 915623e
1 parent 747a932
commit 915623e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/main/java/ganymedes01/etfuturum/compat/ExternalContent.java b/src/main/java/ganymedes01/etfuturum/compat/ExternalContent.java
@@ -147,6 +147,9 @@ public enum Items {
 
 		BLUEPOWER_CIRCUIT_PLATE("bluepower", "stone_tile"),
 		PROJECTRED_CIRCUIT_PLATE("ProjRed|Core", "projectred.core.part"),
+
+		THAUMCRAFT_EARTHMOVER_SHOVEL("Thaumcraft", "ItemShovelElemental"),
+		BOTANIA_MANASTEEL_SHOVEL("Botania", "manasteelShovel"),
 		;
 
 		private Item item;

diff --git a/src/main/java/ganymedes01/etfuturum/core/handlers/ServerEventHandler.java b/src/main/java/ganymedes01/etfuturum/core/handlers/ServerEventHandler.java
@@ -981,7 +981,10 @@ else if (oldBlock instanceof BlockSoulSand) {
 						//This is nested into the same function since they use similar checks
 						if (heldStack != null) {
 							Set<String> toolClasses = heldStack.getItem().getToolClasses(heldStack);
-							if (toolClasses != null) {
+							if (toolClasses != null
+									//TODO dirty solution, make this a list, maybe a HogUtils tag `#etfuturum:no_till_shovels`?
+									&& heldStack.getItem() != ExternalContent.Items.BOTANIA_MANASTEEL_SHOVEL.get()
+									&& heldStack.getItem() != ExternalContent.Items.THAUMCRAFT_EARTHMOVER_SHOVEL.get()) {
 								if (ConfigBlocksItems.enableGrassPath && toolClasses.contains("shovel") && !world.getBlock(x, y + 1, z).getMaterial().isSolid() && (oldBlock == Blocks.grass || oldBlock == Blocks.dirt || oldBlock == Blocks.mycelium)) {
 									player.swingItem();
 									if (!world.isRemote) {