diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java index f0aee1203..46e16fe4f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/ItemTagsGenerator.java @@ -4,7 +4,6 @@ import de.ellpeck.actuallyadditions.api.ActuallyTags; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks; import de.ellpeck.actuallyadditions.mod.items.ActuallyItems; -import de.ellpeck.actuallyadditions.mod.items.base.ActuallyItem; import net.minecraft.core.HolderLookup; import net.minecraft.data.PackOutput; import net.minecraft.data.tags.ItemTagsProvider; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/AllInOneTool.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/AllInOneTool.java index 93ecc96e9..002254b35 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/AllInOneTool.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/items/AllInOneTool.java @@ -1,7 +1,6 @@ package de.ellpeck.actuallyadditions.mod.items; import de.ellpeck.actuallyadditions.api.ActuallyTags; -import de.ellpeck.actuallyadditions.mod.items.base.IActuallyItem; import net.minecraft.world.InteractionResult; import net.minecraft.world.item.DiggerItem; import net.minecraft.world.item.ItemStack; @@ -12,7 +11,7 @@ import net.minecraft.world.item.enchantment.Enchantment; import net.neoforged.neoforge.common.ToolAction; import net.neoforged.neoforge.common.ToolActions; -public class AllInOneTool extends DiggerItem implements IActuallyItem { +public class AllInOneTool extends DiggerItem { private final Tier tier; public AllInOneTool(Tier tier) { diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ActuallyItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ActuallyItem.java deleted file mode 100644 index 513a39fa6..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ActuallyItem.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.ellpeck.actuallyadditions.mod.items.base; - -import net.minecraft.world.item.Item; - -/** - * I'm using a custom class here as I'm sure we'll need a unified way of declaring rules - * but also so we can always know if something is ours in the simplest form. - */ -// Superseded by ItemBase -@Deprecated -public abstract class ActuallyItem extends Item implements IActuallyItem { - public ActuallyItem(Properties properties) { - super(properties); - } - - protected static Properties baseProps() { - return new Properties(); - } -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/IActuallyItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/IActuallyItem.java deleted file mode 100644 index f71d70c18..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/base/IActuallyItem.java +++ /dev/null @@ -1,5 +0,0 @@ -package de.ellpeck.actuallyadditions.mod.items.base; - -// Currently nothing :cry: -public interface IActuallyItem { -} diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/DrillAugmentItem.java b/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/DrillAugmentItem.java deleted file mode 100644 index 76e56b323..000000000 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/DrillAugmentItem.java +++ /dev/null @@ -1,41 +0,0 @@ -package de.ellpeck.actuallyadditions.mod.items.misc; - - -import de.ellpeck.actuallyadditions.mod.items.base.ActuallyItem; - -// Superseded by ItemDrillUpgrade -@Deprecated -public class DrillAugmentItem extends ActuallyItem { - private final AugmentType type; - - public DrillAugmentItem(AugmentType type) { - super(baseProps().stacksTo(1)); - this.type = type; - } - - public AugmentType getType() { - return type; - } - - public enum AugmentType { - SPEED_AUGMENT_I(50), - SPEED_AUGMENT_II(75), - SPEED_AUGMENT_III(175), - SILK_TOUCH_AUGMENT(100), - FORTUNE_AUGMENT_I(40), - FORTUNE_AUGMENT_II(80), - MINING_AUGMENT_I(10), - MINING_AUGMENT_II(30), - BLOCK_PLACING_AUGMENT(0); - - int energyCost; - - AugmentType(int energyCost) { - this.energyCost = energyCost; - } - - public int getEnergyCost() { - return energyCost; - } - } -}