Merge remote-tracking branch 'origin/1.20.4' into 1.20.4

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;

src/main/java/de/ellpeck/actuallyadditions/mod/blocks/ActuallyBlocks.java

@@ -65,7 +65,6 @@ import de.ellpeck.actuallyadditions.mod.tile.TileEntityXPSolidifier;
 import de.ellpeck.actuallyadditions.registration.AABlockReg;
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.world.item.Item;
-import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.SoundType;

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) {

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/ActuallyItem.java

@@ -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();
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/mod/items/base/IActuallyItem.java

@@ -1,5 +0,0 @@
-package de.ellpeck.actuallyadditions.mod.items.base;
-
-// Currently nothing :cry:
-public interface IActuallyItem {
-}

src/main/java/de/ellpeck/actuallyadditions/mod/items/misc/DrillAugmentItem.java

@@ -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;
-        }
-    }
-}

src/main/java/de/ellpeck/actuallyadditions/mod/util/WorldUtil.java

@@ -18,7 +18,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.util.Mth;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.entity.player.Player;
@@ -31,7 +30,6 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
 import net.minecraft.world.phys.Vec3;
 import net.neoforged.neoforge.capabilities.Capabilities;
 import net.neoforged.neoforge.common.CommonHooks;