Item classes rename

src/main/java/ru/betterend/item/DrinkItem.java

@@ -8,8 +8,8 @@ import net.minecraft.util.TypedActionResult;
 import net.minecraft.util.UseAction;
 import net.minecraft.world.World;
 
-public class ItemDrink extends PatternedItem {
-	public ItemDrink(Settings settings) {
+public class DrinkItem extends PatternedItem {
+	public DrinkItem(Settings settings) {
 		super(settings);
 	}
 

src/main/java/ru/betterend/item/EnchantedPetalItem.java

@@ -5,9 +5,8 @@ import net.minecraft.util.Rarity;
 import ru.betterend.patterns.Patterns;
 import ru.betterend.registry.EndItems;
 
-public class EnchantedPetal extends PatternedItem {
-
-	public EnchantedPetal() {
+public class EnchantedPetalItem extends PatternedItem {
+	public EnchantedPetalItem() {
 		super(EndItems.makeItemSettings().rarity(Rarity.RARE).maxCount(16));
 	}
 

src/main/java/ru/betterend/item/EndAxeItem.java

@@ -12,9 +12,8 @@ import net.minecraft.tag.Tag;
 import ru.betterend.patterns.Patterned;
 import ru.betterend.patterns.Patterns;
 
-public class EndAxe extends AxeItem implements DynamicAttributeTool, Patterned {
-
-	public EndAxe(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
+public class EndAxeItem extends AxeItem implements DynamicAttributeTool, Patterned {
+	public EndAxeItem(ToolMaterial material, float attackDamage, float attackSpeed, Settings settings) {
 		super(material, attackDamage, attackSpeed, settings);
 	}
 

src/main/java/ru/betterend/item/EndHammerItem.java

@@ -30,13 +30,12 @@ import ru.betterend.patterns.Patterned;
 import ru.betterend.patterns.Patterns;
 import ru.betterend.registry.EndTags;
 
-public class EndHammer extends MiningToolItem implements DynamicAttributeTool, Patterned {
-	
+public class EndHammerItem extends MiningToolItem implements DynamicAttributeTool, Patterned {
 	public final static UUID ATTACK_KNOCKBACK_MODIFIER_ID = MathHelper.randomUuid(ThreadLocalRandom.current());
 	
 	private final Multimap<EntityAttribute, EntityAttributeModifier> attributeModifiers;
 
-	public EndHammer(ToolMaterial material, float attackDamage, float attackSpeed, double knockback, Settings settings) {
+	public EndHammerItem(ToolMaterial material, float attackDamage, float attackSpeed, double knockback, Settings settings) {
 		super(attackDamage, attackSpeed, material, Sets.newHashSet(), settings);
 
 		Builder<EntityAttribute, EntityAttributeModifier> builder = ImmutableMultimap.builder();

src/main/java/ru/betterend/item/EndHoeItem.java

@@ -5,9 +5,8 @@ import net.minecraft.item.ToolMaterial;
 import ru.betterend.patterns.Patterned;
 import ru.betterend.patterns.Patterns;
 
-public class EndHoe extends HoeItem implements Patterned {
-
-	public EndHoe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+public class EndHoeItem extends HoeItem implements Patterned {
+	public EndHoeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
 		super(material, attackDamage, attackSpeed, settings);
 	}
 	

src/main/java/ru/betterend/item/EndPickaxeItem.java

@@ -12,9 +12,8 @@ import net.minecraft.tag.Tag;
 import ru.betterend.patterns.Patterned;
 import ru.betterend.patterns.Patterns;
 
-public class EndPickaxe extends PickaxeItem implements DynamicAttributeTool, Patterned {
-
-	public EndPickaxe(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
+public class EndPickaxeItem extends PickaxeItem implements DynamicAttributeTool, Patterned {
+	public EndPickaxeItem(ToolMaterial material, int attackDamage, float attackSpeed, Settings settings) {
 		super(material, attackDamage, attackSpeed, settings);
 	}
 	

src/main/java/ru/betterend/item/EndSpawnEggItem.java

@@ -5,8 +5,8 @@ import net.minecraft.item.SpawnEggItem;
 import ru.betterend.patterns.Patterned;
 import ru.betterend.patterns.Patterns;
 
-public class ItemSpawnEgg extends SpawnEggItem implements Patterned {
-	public ItemSpawnEgg(EntityType<?> type, int primaryColor, int secondaryColor, Settings settings) {
+public class EndSpawnEggItem extends SpawnEggItem implements Patterned {
+	public EndSpawnEggItem(EntityType<?> type, int primaryColor, int secondaryColor, Settings settings) {
 		super(type, primaryColor, secondaryColor, settings);
 	}
 	

src/main/java/ru/betterend/item/EternalCrystalItem.java

@@ -3,9 +3,8 @@ package ru.betterend.item;
 import net.minecraft.util.Rarity;
 import ru.betterend.registry.EndItems;
 
-public class EternalCrystal extends PatternedItem {
-
-	public EternalCrystal() {
+public class EternalCrystalItem extends PatternedItem {
+	public EternalCrystalItem() {
 		super(EndItems.makeItemSettings().maxCount(16).rarity(Rarity.EPIC));
 	}
 }

src/main/java/ru/betterend/item/GuideBookItem.java

@@ -18,14 +18,13 @@ import ru.betterend.registry.EndItems;
 import ru.betterend.util.LangUtil;
 import vazkii.patchouli.api.PatchouliAPI;
 
-public class GuideBook extends PatternedItem {
-
+public class GuideBookItem extends PatternedItem {
 	public final static Identifier BOOK_ID = BetterEnd.makeID("guidebook");
-	public static final Item GUIDE_BOOK = EndItems.registerItem(BOOK_ID, new GuideBook());
+	public static final Item GUIDE_BOOK = EndItems.registerItem(BOOK_ID, new GuideBookItem());
 	
 	public static void register() {}
 	
-	public GuideBook() {
+	public GuideBookItem() {
 		super(EndItems.makeItemSettings().maxCount(1));
 	}
 	

src/main/java/ru/betterend/item/material/EndArmorMaterial.java

@@ -1,4 +1,4 @@
-package ru.betterend.item;
+package ru.betterend.item.material;
 
 import java.util.function.Supplier;
 

src/main/java/ru/betterend/item/material/EndToolMaterial.java

@@ -1,4 +1,4 @@
-package ru.betterend.item;
+package ru.betterend.item.material;
 
 import java.util.function.Supplier;