From 184275b90176b34d5310b33d1e983b796c39dae9 Mon Sep 17 00:00:00 2001 From: Michael Hillcox Date: Sat, 21 Nov 2020 10:56:13 +0000 Subject: [PATCH] Refactored tool materials --- .../ToolMaterials.java} | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) rename src/main/java/de/ellpeck/actuallyadditions/common/{items/ActuallyToolsTiers.java => materials/ToolMaterials.java} (86%) diff --git a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyToolsTiers.java b/src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java similarity index 86% rename from src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyToolsTiers.java rename to src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java index 280327ebf..0834770af 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/common/items/ActuallyToolsTiers.java +++ b/src/main/java/de/ellpeck/actuallyadditions/common/materials/ToolMaterials.java @@ -1,5 +1,6 @@ -package de.ellpeck.actuallyadditions.common.items; +package de.ellpeck.actuallyadditions.common.materials; +import de.ellpeck.actuallyadditions.common.items.ActuallyItems; import net.minecraft.item.IItemTier; import net.minecraft.item.Items; import net.minecraft.item.crafting.Ingredient; @@ -8,7 +9,7 @@ import net.minecraft.util.LazyValue; import java.util.function.Supplier; // Mostly a copy of the ItemTier enum because... Lazy -public enum ActuallyToolsTiers implements IItemTier { +public enum ToolMaterials implements IItemTier { EMERALD(3, 2000, 9.0f, 5.0f, 15, () -> Ingredient.fromItems(Items.EMERALD)), OBSIDIAN(3, 8000, 4.0f, 2.0f, 15, () -> Ingredient.fromItems(Items.OBSIDIAN)), @@ -28,7 +29,7 @@ public enum ActuallyToolsTiers implements IItemTier { private final int enchantability; private final LazyValue repairMaterial; - ActuallyToolsTiers(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) { + ToolMaterials(int harvestLevelIn, int maxUsesIn, float efficiencyIn, float attackDamageIn, int enchantabilityIn, Supplier repairMaterialIn) { this.harvestLevel = harvestLevelIn; this.maxUses = maxUsesIn; this.efficiency = efficiencyIn;