Update to 1.20.6 stable and account for breaking changes

Author: pupnewfster

build.gradle

@@ -20,7 +20,7 @@ plugins {
     id('eclipse')
     id('idea')
     id('maven-publish')
-    id('net.neoforged.gradle.userdev') version('7.0.138')//https://projects.neoforged.net/neoforged/neogradle
+    id('net.neoforged.gradle.userdev') version('7.0.142')//https://projects.neoforged.net/neoforged/neogradle
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -157,7 +157,7 @@ SourceSet setupExtraSourceSet(SourceSet baseSourceSet, String extra) {
     extraSourceSet.compileClasspath += project.sourceSets.main.output
     if (baseSourceSet != project.sourceSets.main) {
         //If the base sourceSet is main it already is the extra source set and has a reference to the base one from before this if statement
-        extraSourceSet.compileClasspath += getExtraSourceSet(project.sourceSets.main, extra).output
+        extraSourceSet.compileClasspath += getExtraSourceSet(project.sourceSets.main, extra).get().output
         extraSourceSet.compileClasspath += baseSourceSet.output
         extraSourceSet.runs.modIdentifier = name
     }
@@ -170,12 +170,12 @@ static void extendConfigurations(Configuration base, Configuration... configurat
     }
 }
 
-SourceSet getExtraSourceSet(String base, String name) {
-    return getExtraSourceSet(project.sourceSets.named(base).get(), name)
+Provider<SourceSet> getExtraSourceSet(String base, String name) {
+    return project.sourceSets.named(base).flatMap(sourceSet -> getExtraSourceSet(sourceSet, name))
 }
 
-SourceSet getExtraSourceSet(SourceSet base, String name) {
-    return project.sourceSets.named(base.getTaskName(name, null)).get()
+Provider<SourceSet> getExtraSourceSet(SourceSet base, String name) {
+    return project.sourceSets.named(base.getTaskName(name, null))
 }
 
 setupTasks(sourceSets.main)
@@ -205,7 +205,7 @@ def setupTasks(SourceSet sourceSet) {
     }
     tasks.named(sourceSet.compileJavaTaskName, JavaCompile).configure { setGroup('compile') }
     for (String extraType : extraTypes) {
-        def extraSourceSet = getExtraSourceSet(sourceSet, extraType)
+        def extraSourceSet = getExtraSourceSet(sourceSet, extraType).get()
         tasks.named(extraSourceSet.processResourcesTaskName, ProcessResources).configure {
             setGroup('process resources')
             dependsOn(compileTask)
@@ -267,22 +267,22 @@ static void setupClientAcc(Run run) {
 }
 
 runs {
-    configureEach { Run run ->
-        if (run.project.hasProperty('forge_force_ansi')) {
+    configureEach {
+        if (hasProperty('forge_force_ansi')) {
             //Force ansi if declared as a gradle variable, as the auto detection doesn't detect IntelliJ properly
             // or eclipse's plugin that adds support for ansi escape in console
-            run.jvmArguments.add("-Dterminal.ansi=${run.project.property('forge_force_ansi')}")
+            jvmArguments.add("-Dterminal.ansi=${property('forge_force_ansi')}")
         }
 
-        run.modSources.addAll((SourceSet[]) [sourceSets.main, sourceSets.api])
+        modSources.add((SourceSet[]) [sourceSets.main, sourceSets.api])
 
         for (String name : secondaryModules) {
-            run.modSources.add((SourceSet) sourceSets.getByName(name))
+            modSources.add((SourceSet) sourceSets.named(name).get())
         }
 
         //if the selected toolchain is a JBR, enable DCEVM
-        if (run.project.javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.getOrElse('').contains('JetBrains')) {
-            run.jvmArguments.add('-XX:+AllowEnhancedClassRedefinition')
+        if (javaToolchains.launcherFor(java.toolchain).map { it.metadata.vendor }.getOrElse('').contains('JetBrains')) {
+            jvmArguments.add('-XX:+AllowEnhancedClassRedefinition')
         }
     }
     client { Run run -> setupClientAcc(run) }
@@ -314,13 +314,12 @@ runs {
         modSources.add((SourceSet) sourceSets.datagenMain)
 
         for (String name : secondaryModules) {
-            def modName = "mekanism${name}"
-            modSources.add(getExtraSourceSet(name, 'datagen'))
-            programArguments.addAll((String[]) ['--mod', modName, '--existing', file("src/${name}/resources/").absolutePath])
+            modSources.add(getExtraSourceSet(name, 'datagen').get())
+            programArguments.addAll((String[]) ['--mod', "mekanism${name}", '--existing', file("src/${name}/resources/").absolutePath])
         }
 
         dependencies {
-            runtime(project.configurations.datagenNonMod)
+            runtime(configurations.datagenNonMod)
         }
     }
 }
@@ -505,8 +504,8 @@ def mergeModuleResources = tasks.register('mergeModuleResources', MergeModuleRes
     annotationGenerated = sourceSets.main.output.classesDirs
     for (String name : secondaryModules) {
         SourceSet secondarySourceSet = sourceSets.named(name).get()
-        resources = resources + tasks.named(secondarySourceSet.processResourcesTaskName).get().outputs.files
-        annotationGenerated = annotationGenerated + secondarySourceSet.output.classesDirs
+        resources += tasks.named(secondarySourceSet.processResourcesTaskName).get().outputs.files
+        annotationGenerated += secondarySourceSet.output.classesDirs
     }
     //Only look at generated service files as a restriction for our input
     annotationGenerated = annotationGenerated.asFileTree.matching(serviceFilter)
@@ -521,7 +520,7 @@ def allJar = tasks.register('allJar', AllJar, {
     apiOutput = sourceSets.api.output
     mainOutput = sourceSets.main.output
     for (String name : secondaryModules) {
-        secondaryModuleOutputs = secondaryModuleOutputs + sourceSets.named(name).get().output
+        secondaryModuleOutputs += sourceSets.named(name).get().output
     }
 })
 
@@ -531,6 +530,7 @@ tasks.withType(JavaCompile).configureEach({
 })
 
 tasks.withType(Javadoc).configureEach({
+    options.encoding = 'UTF-8'
     options.tags = [
             'apiNote:a:<em>API Note:</em>',
             'implSpec:a:<em>Implementation Requirements:</em>',

gradle.properties

@@ -9,11 +9,11 @@ minecraft_version=1.20.6
 previous_minecraft_version=1.20.1
 previous_minor_minecraft_version=1.20.4
 loader_version_range=[3,)
-forge_version=20.6.104-beta
+forge_version=20.6.115
 mod_version=10.5.20
 #This determines the minimum version of forge required to use Mekanism
 # Only bump it whenever we need access to a feature in forge that is not available in earlier versions
-forge_version_range=[20.6.104-beta,)
+forge_version_range=[20.6.113-beta,)
 minecraft_version_range=[1.20.6]
 #This specifies what type of release it will be uploaded to CurseForge and Modrinth as
 # options are: alpha, beta, release

src/main/java/mekanism/common/block/BlockBounding.java

@@ -163,6 +163,24 @@ public boolean onDestroyedByPlayer(@NotNull BlockState state, @NotNull Level wor
         return super.onDestroyedByPlayer(state, world, pos, player, false, fluidState);
     }
 
+    @NotNull
+    @Override
+    public BlockState playerWillDestroy(@NotNull Level level, @NotNull BlockPos pos, @NotNull BlockState state, @NotNull Player player) {
+        BlockPos mainPos = getMainBlockPos(level, pos);
+        if (mainPos != null) {
+            BlockState mainState = level.getBlockState(mainPos);
+            if (!mainState.isAir()) {
+                //Call player will destroy on the main block in case we have any other logic we want to run, but then return ourselves as the state
+                // similar to what calling super would do.
+                // Note: We don't call super as we don't want to spawn block break particles twice, and it only really makes sense to be firing the
+                // game event for the main block position
+                mainState.getBlock().playerWillDestroy(level, mainPos, mainState, player);
+                return state;
+            }
+        }
+        return super.playerWillDestroy(level, pos, state, player);
+    }
+
     @Override
     protected void onExplosionHit(@NotNull BlockState state, @NotNull Level level, @NotNull BlockPos pos, @NotNull Explosion explosion,
           @NotNull BiConsumer<ItemStack, BlockPos> dropConsumer) {

src/main/java/mekanism/common/block/basic/BlockLogisticalSorter.java

@@ -82,7 +82,7 @@ protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull Blo
                     //Note: This should always be false for the logistical sorter, but we keep it here for good measure
                     return ItemInteractionResult.FAIL;
                 }
-                WorldUtils.dismantleBlock(state, world, pos, player);
+                WorldUtils.dismantleBlock(state, world, pos, player, stack);
                 return ItemInteractionResult.SUCCESS;
             }
             Direction change = tile.getDirection().getClockWise();

src/main/java/mekanism/common/block/prefab/BlockBase.java

@@ -136,7 +136,7 @@ protected ItemInteractionResult useItemOn(@NotNull ItemStack stack, @NotNull Blo
         if (player.isShiftKeyDown() && MekanismUtils.canUseAsWrench(stack)) {
             //Note: We don't handle checking if it is radioactive here, as the assumption is it doesn't have a tile so won't have that information
             if (!world.isClientSide) {
-                WorldUtils.dismantleBlock(state, world, pos, player);
+                WorldUtils.dismantleBlock(state, world, pos, player, stack);
             }
             return ItemInteractionResult.SUCCESS;
         }

src/main/java/mekanism/common/content/gear/mekatool/ModuleShearingUnit.java

@@ -26,7 +26,6 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
-import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.BeehiveBlock;
 import net.minecraft.world.level.block.Block;
@@ -131,9 +130,9 @@ private boolean tryShearLivingEntity(@Nullable IEnergyContainer energyContainer,
 
     private boolean shearEntity(@Nullable IEnergyContainer energyContainer, LivingEntity entity, @Nullable Player player, ItemStack stack, Level world, BlockPos pos) {
         IShearable target = (IShearable) entity;
-        if (target.isShearable(stack, world, pos)) {
+        if (target.isShearable(player, stack, world, pos)) {
             if (!world.isClientSide) {
-                for (ItemStack drop : target.onSheared(player, stack, world, pos, stack.getEnchantmentLevel(Enchantments.FORTUNE))) {
+                for (ItemStack drop : target.onSheared(player, stack, world, pos)) {
                     target.spawnShearedDrop(world, pos, drop);
                 }
                 entity.gameEvent(GameEvent.SHEAR, player);

src/main/java/mekanism/common/tile/base/TileEntityMekanism.java

@@ -588,7 +588,7 @@ public WrenchResult tryWrench(BlockState state, Player player, ItemStack stack)
                     //Don't allow dismantling radioactive blocks
                     return WrenchResult.RADIOACTIVE;
                 }
-                WorldUtils.dismantleBlock(state, getLevel(), worldPosition, this, player);
+                WorldUtils.dismantleBlock(state, getLevel(), worldPosition, this, player, stack);
                 return WrenchResult.DISMANTLED;
             }
             //Special ITileDirectional handling

src/main/java/mekanism/common/tile/laser/TileEntityBasicLaser.java

@@ -331,7 +331,7 @@ private void withFakePlayer(ServerLevel level, double x, double y, double z, Blo
                 level.removeBlock(hitPos, false);
             } else {
                 //Use the disassembler as the item to break the block with as that is marked as being the correct tool for drops
-                handleBreakBlock(hitState, hitPos, dummy, ItemAtomicDisassembler.fullyChargedStack());
+                handleBreakBlock(hitState, level, hitPos, dummy, ItemAtomicDisassembler.fullyChargedStack());
             }
         }
         dummy.cleanupFakePlayer(level);
@@ -395,12 +395,17 @@ protected boolean handleHitItem(ItemEntity entity) {
         return false;
     }
 
-    protected void handleBreakBlock(BlockState state, BlockPos hitPos, Player player, ItemStack tool) {
-        Block.dropResources(state, level, hitPos, WorldUtils.getTileEntity(level, hitPos), player, tool, false);
-        breakBlock(state, hitPos);
+    protected void handleBreakBlock(BlockState state, ServerLevel level, BlockPos hitPos, Player player, ItemStack tool) {
+        for (ItemEntity drop : WorldUtils.getDrops(state, level, hitPos, WorldUtils.getTileEntity(level, hitPos), player, tool, true)) {
+            if (!drop.getItem().isEmpty()) {
+                level.addFreshEntity(drop);
+            }
+        }
+        breakBlock(state, level, hitPos, tool);
     }
 
-    protected final void breakBlock(BlockState state, BlockPos hitPos) {
+    protected final void breakBlock(BlockState state, ServerLevel level, BlockPos hitPos,  ItemStack tool) {
+        state.spawnAfterBreak(level, hitPos, tool, false);
         level.removeBlock(hitPos, false);
         //TODO: We may want to evaluate at some point doing this with our fake player so that it is fired as the "cause"?
         level.gameEvent(GameEvent.BLOCK_DESTROY, hitPos, GameEvent.Context.of(null, state));

src/main/java/mekanism/common/tile/laser/TileEntityLaserTractorBeam.java

@@ -1,6 +1,5 @@
 package mekanism.common.tile.laser;
 
-import java.util.ArrayList;
 import java.util.List;
 import mekanism.api.Action;
 import mekanism.api.AutomationType;
@@ -55,13 +54,13 @@ protected IInventorySlotHolder getInitialInventory(IContentsListener listener) {
     }
 
     @Override
-    protected void handleBreakBlock(BlockState state, BlockPos hitPos, Player player, ItemStack tool) {
-        List<ItemStack> drops = new ArrayList<>(Block.getDrops(state, (ServerLevel) level, hitPos, WorldUtils.getTileEntity(level, hitPos), player, tool));
+    protected void handleBreakBlock(BlockState state, ServerLevel level, BlockPos hitPos, Player player, ItemStack tool) {
+        List<ItemStack> drops = WorldUtils.getDrops(state, level, hitPos, WorldUtils.getTileEntity(level, hitPos), player, tool);
         //Collect any extra drops that might have happened due to say breaking the top part of a door or flower and try to add them
         //Note: Technically we should just always return true rather than relying on the return result of the add method,
         // but as array lists always will return true as they are modified we don't have to worry about that
         CommonWorldTickHandler.fallbackItemCollector = drops::add;
-        breakBlock(state, hitPos);
+        breakBlock(state, level, hitPos, tool);
         CommonWorldTickHandler.fallbackItemCollector = null;
         if (!drops.isEmpty()) {
             BlockPos dropPos = null;

src/main/java/mekanism/common/tile/machine/TileEntityDigitalMiner.java

@@ -1281,7 +1281,7 @@ private List<ItemStack> getDrops(BlockState state, BlockPos pos) {
         ServerLevel level = (ServerLevel) getWorldNN();
         MekFakePlayer dummy = MekFakePlayer.setupFakePlayer(level, this.worldPosition.getX(), this.worldPosition.getY(), this.worldPosition.getZ());
         dummy.setEmulatingUUID(getOwnerUUID());//pretend to be the owner
-        List<ItemStack> drops = Block.getDrops(state, level, pos, WorldUtils.getTileEntity(level, pos), dummy, stack);
+        List<ItemStack> drops = WorldUtils.getDrops(state, level, pos, WorldUtils.getTileEntity(level, pos), dummy, stack);
         dummy.cleanupFakePlayer(level);
         return drops;
     }