Pushing tag for release?

CHANGELOG.md

@@ -1,6 +1,9 @@
 # 1.3.7+mc1.21.1
 * Added recipes for AA crops in the IE cloche.
 * Fix All in One Tool stats
+* Fixed the Vertical Miner / Phantom Breaker not breaking / harvesting blocks properly.
+* Fixed Energy lasers not properly filling mekanism energy cubes only needing 2 FE.
+* Fixed Batbox's not properly invalidating capabilities.
 
 # 1.3.6+mc1.21.1
 * Add the ability to open the Crafting Table On A Stick while inside a Curios slot

build.gradle

@@ -59,6 +59,7 @@ neoForge {
         }
 
         configureEach { run ->
+            logLevel = org.slf4j.event.Level.DEBUG
             jvmArgument '-Xmx4G'
 
             if (run.project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.getOrElse("").contains("JetBrains")) {

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

@@ -61,11 +61,12 @@ public class BlockBatteryBox extends BlockContainerBase {
     protected ItemInteractionResult useItemOn(ItemStack pStack, BlockState pState, Level world, BlockPos pos, Player player, InteractionHand hand, BlockHitResult pHitResult) {
         BlockEntity tile = world.getBlockEntity(pos);
         if (tile instanceof TileEntityBatteryBox box) {
-	        ItemStack stack = player.getItemInHand(hand);
+            ItemStack stack = player.getItemInHand(hand);
 
             if (!stack.isEmpty()) {
                 if (stack.getItem() instanceof ItemBattery && box.inv.getStackInSlot(0).isEmpty()) {
                     box.inv.setStackInSlot(0, stack.copy());
+                    box.invalidateCapabilities();
                     player.setItemInHand(hand, ItemStack.EMPTY);
                     return ItemInteractionResult.SUCCESS;
                 }
@@ -74,6 +75,7 @@ public class BlockBatteryBox extends BlockContainerBase {
                 if (!inSlot.isEmpty()) {
                     player.setItemInHand(hand, inSlot.copy());
                     box.inv.setStackInSlot(0, ItemStack.EMPTY);
+                    box.invalidateCapabilities();
                     return ItemInteractionResult.SUCCESS;
                 }
             }

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBatteryBox.java

@@ -135,7 +135,7 @@ public class TileEntityBatteryBox extends TileEntityInventoryBase implements ISh
 
         for (BlockEntity tile : startTile.tilesAround) {
             if (tile instanceof TileEntityBatteryBox box) {
-	            if (!pushOffTo.contains(box)) {
+                if (!pushOffTo.contains(box)) {
                     pushOffTo.add(box);
 
                     this.energyPushOffLoop(box, pushOffTo);

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelayEnergy.java

@@ -214,13 +214,15 @@ public class TileEntityLaserRelayEnergy extends TileEntityLaserRelay {
                                     int trans = 0;
                                     int theoreticalReceived = cap.receiveEnergy(Math.min(amountPer, lowestCap), true);
                                     if (theoreticalReceived > 0) {
-                                        int deduct = this.calcDeduction(theoreticalReceived, highestLoss);
+                                        int deduct = this.calcDeduction(theoreticalReceived, highestLoss); // TODO maybe we do a minimum threshold before losses occur?
                                         if (deduct >= theoreticalReceived) { //Happens with small numbers
                                             deduct = 0;
                                         }
-
-                                        trans += cap.receiveEnergy(theoreticalReceived - deduct, simulate);
-                                        trans += deduct;
+                                        int actual = cap.receiveEnergy(theoreticalReceived - deduct, simulate);
+                                        if (actual > 0) {
+                                            trans += actual;
+                                            trans += deduct;
+                                        }
                                     }
 
                                     return trans;

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLongRangeBreaker.java

@@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.tile;
 
 import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerDirectionalBreaker;
+import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor;
 import de.ellpeck.actuallyadditions.mod.util.StackUtil;
 import de.ellpeck.actuallyadditions.mod.util.WorldUtil;
@@ -104,7 +105,7 @@ public class TileEntityLongRangeBreaker extends TileEntityInventoryBase implemen
                 Block blockToBreak = breakState.getBlock();
                 if (blockToBreak != null && !this.level.isEmptyBlock(coordsBlock) && this.level.getBlockState(coordsBlock).getDestroySpeed(this.level, coordsBlock) > -1.0F) {
                     List<ItemStack> drops = Block.getDrops(breakState, (ServerLevel) this.level, coordsBlock, this.level.getBlockEntity(coordsBlock));
-                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.level, coordsBlock);
+                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, this.level, coordsBlock);
 
                     if (chance > 0 && this.level.random.nextFloat() <= chance) {
                         if (StackUtil.canAddAll(this.inv, drops, false)) {

src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityVerticalDigger.java

@@ -13,6 +13,7 @@ package de.ellpeck.actuallyadditions.mod.tile;
 import de.ellpeck.actuallyadditions.mod.blocks.ActuallyBlocks;
 import de.ellpeck.actuallyadditions.mod.config.CommonConfig;
 import de.ellpeck.actuallyadditions.mod.inventory.ContainerMiner;
+import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.network.PacketHelperServer;
 import de.ellpeck.actuallyadditions.mod.network.gui.IButtonReactor;
 import de.ellpeck.actuallyadditions.mod.util.ItemStackHandlerAA.IAcceptor;
@@ -139,7 +140,7 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements
             : 1);
         if (this.storage.getEnergyStored() >= actualUse) {
             BlockPos pos = new BlockPos(this.worldPosition.getX() + this.checkX, this.checkY, this.worldPosition.getZ() + this.checkZ);
-            ItemStack fakePickaxe = Items.NETHERITE_PICKAXE.getDefaultInstance();
+            ItemStack fakePickaxe = new ItemStack(ActuallyItems.NETHERITE_AIOT.get());
 
             BlockState state = this.level.getBlockState(pos);
             Block block = state.getBlock();
@@ -147,7 +148,7 @@ public class TileEntityVerticalDigger extends TileEntityInventoryBase implements
             if (!state.isAir()) {
                 if (fakePickaxe.isCorrectToolForDrops(state) && state.getDestroySpeed(this.level, pos) >= 0F && this.isMinable(state, stack)) {
                     List<ItemStack> drops = Block.getDrops(state, (ServerLevel) this.level, pos, this.level.getBlockEntity(pos));
-                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, drops, this.level, pos);
+                    float chance = WorldUtil.fireFakeHarvestEventsForDropChance(this, this.level, pos);
 
                     if (chance > 0 && this.level.random.nextFloat() <= chance) {
                         if (StackUtil.canAddAll(this.inv, drops, false)) {

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

@@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.util;
 
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditions;
 import de.ellpeck.actuallyadditions.mod.ActuallyAdditionsClient;
+import de.ellpeck.actuallyadditions.mod.items.ActuallyItems;
 import de.ellpeck.actuallyadditions.mod.tile.FilterSettings;
 import de.ellpeck.actuallyadditions.mod.util.compat.SlotlessableItemHandlerWrapper;
 import net.minecraft.core.BlockPos;
@@ -257,9 +258,12 @@ public final class WorldUtil {
     }
 
     //I think something is up with this, but I'm not entirely certain what.
-    public static float fireFakeHarvestEventsForDropChance(BlockEntity caller, List<ItemStack> drops, Level level, BlockPos pos) {
+    // TODO We really need to refactor this out of existence... -Flanks
+    public static float fireFakeHarvestEventsForDropChance(BlockEntity caller, Level level, BlockPos pos) {
         if (level instanceof ServerLevel) {
             FakePlayer fake = FakePlayerFactory.getMinecraft((ServerLevel) level);
+            ItemStack fakeTool = new ItemStack(ActuallyItems.NETHERITE_AIOT.get());
+            fake.getInventory().items.set(fake.getInventory().selected, fakeTool);
             BlockPos tePos = caller.getBlockPos();
             fake.setPos(tePos.getX() + 0.5, tePos.getY() + 0.5, tePos.getZ() + 0.5);
             BlockState state = level.getBlockState(pos);