From f2b4f4dc99e3b50d18a819ce93eabc5630b9dab8 Mon Sep 17 00:00:00 2001
From: paulevsGitch <paulevs@yandex.ru>
Date: Mon, 22 Mar 2021 06:28:59 +0300
Subject: [PATCH] Pickaxe and crystals fix, pickaxe effective on end stone

---
 src/main/java/ru/betterend/item/EndPickaxeItem.java | 12 ++++++++++++
 src/main/java/ru/betterend/registry/EndItems.java   |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ru/betterend/item/EndPickaxeItem.java b/src/main/java/ru/betterend/item/EndPickaxeItem.java
index ce27a658..67adfede 100644
--- a/src/main/java/ru/betterend/item/EndPickaxeItem.java
+++ b/src/main/java/ru/betterend/item/EndPickaxeItem.java
@@ -2,7 +2,10 @@ package ru.betterend.item;
 
 import net.fabricmc.fabric.api.tool.attribute.v1.DynamicAttributeTool;
 import net.fabricmc.fabric.api.tool.attribute.v1.FabricToolTags;
+import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl;
+import net.fabricmc.fabric.impl.tool.attribute.ToolManagerImpl.Entry;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
@@ -25,6 +28,15 @@ public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool,
 		return 0;
 	}
 	
+	@Override
+	public float getMiningSpeedMultiplier(ItemStack stack, BlockState state) {
+		if (this.getMaterial().getMiningLevel() > 2 && state.getMaterial().equals(Blocks.END_STONE.getDefaultState().getMaterial())) {
+			return this.miningSpeed * 3;
+		}
+		Entry entry = ToolManagerImpl.entryNullable(state.getBlock());
+		return (entry != null && entry.getMiningLevel(FabricToolTags.PICKAXES) >= 0) ? this.miningSpeed : super.getMiningSpeedMultiplier(stack, state);
+	}
+	
 	@Override
 	public String getModelPattern(String name) {
 		return Patterns.createJson(Patterns.ITEM_HANDHELD, name);
diff --git a/src/main/java/ru/betterend/registry/EndItems.java b/src/main/java/ru/betterend/registry/EndItems.java
index 11df214c..e35a376b 100644
--- a/src/main/java/ru/betterend/registry/EndItems.java
+++ b/src/main/java/ru/betterend/registry/EndItems.java
@@ -19,7 +19,6 @@ import net.minecraft.item.FoodComponent;
 import net.minecraft.item.FoodComponents;
 import net.minecraft.item.Item;
 import net.minecraft.item.Item.Settings;
-import net.minecraft.sound.SoundEvent;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.item.ShovelItem;
@@ -27,6 +26,7 @@ import net.minecraft.item.SpawnEggItem;
 import net.minecraft.item.SwordItem;
 import net.minecraft.item.ToolItem;
 import net.minecraft.item.ToolMaterials;
+import net.minecraft.sound.SoundEvent;
 import net.minecraft.tag.Tag;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.Rarity;