Added older registries back in

src/main/java/appeng/items/tools/powered/ToolChargedStaff.java

@@ -20,6 +20,7 @@ package appeng.items.tools.powered;
 
 
 import net.minecraft.entity.LivingEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.DamageSource;
 import net.minecraft.util.math.AxisAlignedBB;
@@ -35,9 +36,9 @@ import appeng.util.Platform;
 public class ToolChargedStaff extends AEBasePoweredItem
 {
 
-	public ToolChargedStaff()
+	public ToolChargedStaff(Item.Properties props)
 	{
-		super( AEConfig.instance().getChargedStaffBattery() );
+		super( AEConfig.instance().getChargedStaffBattery(), props );
 	}
 
 	@Override

src/main/java/appeng/items/tools/powered/ToolColorApplicator.java

@@ -51,6 +51,7 @@ import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.SnowballItem;
 import net.minecraft.nbt.CompoundNBT;
@@ -87,9 +88,9 @@ public class ToolColorApplicator extends AEBasePoweredItem implements IStorageCe
 		}
 	}
 
-	public ToolColorApplicator()
+	public ToolColorApplicator(Item.Properties props)
 	{
-		super( AEConfig.instance().getColorApplicatorBattery() );
+		super( AEConfig.instance().getColorApplicatorBattery(), props );
 	}
 
 	@Override

src/main/java/appeng/items/tools/powered/ToolEntropyManipulator.java

@@ -31,6 +31,7 @@ import net.minecraft.block.TNTBlock;
 import net.minecraft.block.material.Material;
 import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.util.ActionResult;
@@ -60,9 +61,9 @@ public class ToolEntropyManipulator extends AEBasePoweredItem implements IBlockT
 	private final Map<InWorldToolOperationIngredient, InWorldToolOperationResult> heatUp;
 	private final Map<InWorldToolOperationIngredient, InWorldToolOperationResult> coolDown;
 
-	public ToolEntropyManipulator()
+	public ToolEntropyManipulator(Item.Properties props)
 	{
-		super( AEConfig.instance().getEntropyManipulatorBattery() );
+		super( AEConfig.instance().getEntropyManipulatorBattery(), props );
 
 		this.heatUp = new HashMap<>();
 		this.coolDown = new HashMap<>();

src/main/java/appeng/items/tools/powered/ToolMatterCannon.java

@@ -29,6 +29,7 @@ import net.minecraft.entity.LivingEntity;
 import net.minecraft.entity.item.ItemEntity;
 import net.minecraft.entity.passive.SheepEntity;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.*;
@@ -73,9 +74,9 @@ import appeng.util.Platform;
 public class ToolMatterCannon extends AEBasePoweredItem implements IStorageCell<IAEItemStack>
 {
 
-	public ToolMatterCannon()
+	public ToolMatterCannon(Item.Properties props)
 	{
-		super( AEConfig.instance().getMatterCannonBattery() );
+		super( AEConfig.instance().getMatterCannonBattery(), props );
 	}
 
 	@OnlyIn( Dist.CLIENT )

src/main/java/appeng/items/tools/powered/ToolPortableCell.java

@@ -24,6 +24,7 @@ import java.util.Set;
 
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.ActionResult;
 import net.minecraft.util.ActionResultType;
@@ -60,9 +61,9 @@ import appeng.util.Platform;
 
 public class ToolPortableCell extends AEBasePoweredItem implements IStorageCell<IAEItemStack>, IGuiItem, IItemGroup
 {
-	public ToolPortableCell()
+	public ToolPortableCell(Item.Properties props)
 	{
-		super( AEConfig.instance().getPortableCellBattery() );
+		super( AEConfig.instance().getPortableCellBattery(), props );
 	}
 
 	@Override

src/main/java/appeng/items/tools/powered/ToolWirelessTerminal.java

@@ -24,6 +24,7 @@ import java.util.List;
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.CompoundNBT;
 import net.minecraft.util.ActionResult;
@@ -52,9 +53,9 @@ import appeng.util.ConfigManager;
 public class ToolWirelessTerminal extends AEBasePoweredItem implements IWirelessTermHandler
 {
 
-	public ToolWirelessTerminal()
+	public ToolWirelessTerminal(Item.Properties props)
 	{
-		super( AEConfig.instance().getWirelessTerminalBattery() );
+		super( AEConfig.instance().getWirelessTerminalBattery(), props );
 	}
 
 	@Override

src/main/java/appeng/items/tools/powered/powersink/AEBasePoweredItem.java

@@ -21,6 +21,7 @@ package appeng.items.tools.powered.powersink;
 
 import java.text.MessageFormat;
 import java.util.List;
+import java.util.function.DoubleSupplier;
 
 import net.minecraft.client.util.ITooltipFlag;
 import net.minecraft.item.ItemGroup;
@@ -47,14 +48,12 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
 {
 	private static final String CURRENT_POWER_NBT_KEY = "internalCurrentPower";
 	private static final String MAX_POWER_NBT_KEY = "internalMaxPower";
-	private final double powerCapacity;
+	private final DoubleSupplier powerCapacity;
 
-	public AEBasePoweredItem( final double powerCapacity )
+	public AEBasePoweredItem(final DoubleSupplier powerCapacity, Properties props )
 	{
-		super(new Properties().maxStackSize( 1 ).maxDamage( 32 ).setNoRepair());
-		//FIXME
-//		this.hasSubtypes = false;
-//		this.setFull3D();
+		super(props);
+// FIXME this.setFull3D();
 
 		this.powerCapacity = powerCapacity;
 	}
@@ -153,7 +152,7 @@ public abstract class AEBasePoweredItem extends AEBaseItem implements IAEItemPow
 	@Override
 	public double getAEMaxPower( final ItemStack is )
 	{
-		return this.powerCapacity;
+		return this.powerCapacity.getAsDouble();
 	}
 
 	@Override