Update deps and address breaking changes in Neo

pupnewfster · pupnewfster · commit 558f9e2b30c0 · 2024-05-25T14:41:26.000-05:00
diff --git a/build.gradle b/build.gradle
@@ -12,13 +12,13 @@ import java.util.function.Consumer
 
 plugins {
     id 'org.ajoberstar.grgit.service' version '5.2.2'
-    id 'net.darkhax.curseforgegradle' version '1.1.23'
+    id 'net.darkhax.curseforgegradle' version '1.1.24'
     id "com.modrinth.minotaur" version "2.+"
     id 'java'
     id 'eclipse'
     id 'idea'
     id 'maven-publish'
-    id 'net.neoforged.gradle.userdev' version '7.0.133'//https://projects.neoforged.net/neoforged/neogradle
+    id 'net.neoforged.gradle.userdev' version '7.0.134'//https://projects.neoforged.net/neoforged/neogradle
 }
 
 tasks.named('wrapper', Wrapper).configure {
@@ -438,7 +438,7 @@ dependencies {
 
     compileOnly("dev.emi:emi-neoforge:${emi_version}+${minecraft_version}:api")
     def emi = "dev.emi:emi-neoforge:${emi_version}+${minecraft_version}"
-    //TODO - 1.20.5: Re-evaluate
+    //TODO - 1.20.5: Re-evaluate (https://github.com/emilyploszaj/emi/issues/537) might allow us to not have to do this
     //Compile against full emi in datagen
     datagenMainCompileOnly(emi)
     if (recipe_viewer == "emi" || recipe_viewer == "hybrid") {
@@ -460,15 +460,13 @@ dependencies {
         transitive = false
     }*/
     compileOnly("curse.maven:jade-api-324717:${jade_api_id}")
-    //TODO - 1.20.5: Re-enable when Jade updates
-    //localRuntime("curse.maven:jade-324717:${jade_id}")
+    localRuntime("curse.maven:jade-324717:${jade_id}")
     compileOnly("mcp.mobius.waila:wthit-api:neo-${wthit_version}")
 
     def crt = "com.blamejared.crafttweaker:CraftTweaker-neoforge-${previous_minor_minecraft_version}:${crafttweaker_version}"
     compileOnly(crt)
     //TODO - 1.20.5: Re-enable when it updates
     //localRuntime(crt)
-    //TODO - 1.20.2: move back to implementation
     def jeiTweaker = "com.blamejared.jeitweaker:JeiTweaker-forge-${previous_minecraft_version}:${jeitweaker_version}"
     compileOnly(jeiTweaker)
     //TODO - 1.20.5: Re-enable when it updates
diff --git a/gradle.properties b/gradle.properties
@@ -7,12 +7,12 @@ minecraft_version=1.20.6
 #Used as a helper for porting when deps we use have not updated yet
 previous_minecraft_version=1.20.1
 previous_minor_minecraft_version=1.20.4
-loader_version_range=[2,)
-forge_version=20.6.72-beta
+loader_version_range=[3,)
+forge_version=20.6.78-beta
 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.72-beta,)
+forge_version_range=[20.6.78-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
@@ -35,12 +35,12 @@ yamlops_version=1.2.0
 
 #Mod dependencies
 cc_tweaked_version=1.110.3
-curios_version=8.0.0-beta+1.20.6
+curios_version=8.0.0-beta.3+1.20.6
 emi_version=1.1.6
 jade_api_id=5288706
-jade_id=5288504
+jade_id=5366595
 top_version=1.20.5_neo-11.1.1-2
-wthit_version=11.1.3
+wthit_version=11.1.6
 
 #Mod dependency min version ranges
 
@@ -49,13 +49,13 @@ wthit_version=11.1.3
 
 
 #Mod dependencies for recipes (only used by our data generators)
-ae2_version=18.1.1-alpha
-biomesoplenty_version=18.4.0.2
-glitchcore_version=1.1.0.5
-terrablender_version=3.5.0.3
+ae2_version=18.1.2-alpha
+biomesoplenty_version=18.4.0.5
+glitchcore_version=1.1.0.10
+terrablender_version=3.5.0.4
 
 #Outdated mod dependencies
-crafttweaker_version=17.0.3
+crafttweaker_version=17.0.17
 
 ctm_version=1.1.7+11
 flux_networks_id=5234697
@@ -65,7 +65,7 @@ json_things_version=0.10.0
 oc2_id=3896581
 projecte_api_id=4860862
 recipe_stages_version=8.0.0.1
-wildfire_gender_mod_id=4603538
+wildfire_gender_mod_id=5357649
 
 #Outdated mod dependencies for recipes
 farmers_delight_id=5051242
diff --git a/src/main/java/mekanism/common/CommonPlayerTracker.java b/src/main/java/mekanism/common/CommonPlayerTracker.java
@@ -19,9 +19,9 @@
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.block.Block;
-import net.neoforged.bus.api.Event;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.common.util.TriState;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerChangedDimensionEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerEvent.PlayerLoggedInEvent;
@@ -87,11 +87,11 @@ public void rightClickEvent(RightClickBlock event) {
             //it's a wrench, see if it's our block. Not the configurator, as it handles bypass correctly
             Block block = event.getLevel().getBlockState(event.getPos()).getBlock();
             if (block instanceof BlockMekanism || block instanceof BlockBounding) {
-                event.setUseBlock(Event.Result.ALLOW);//force it to use the item on the block
+                event.setUseBlock(TriState.TRUE);//force it to use the item on the block
             }
         } else if (event.getEntity().isShiftKeyDown() && event.getLevel().getBlockState(event.getPos()).getBlock() instanceof BlockCardboardBox) {
-            event.setUseBlock(Event.Result.ALLOW);
-            event.setUseItem(Event.Result.DENY);
+            event.setUseBlock(TriState.TRUE);
+            event.setUseItem(TriState.FALSE);
         }
     }
 }
diff --git a/src/main/java/mekanism/common/entity/EntityFlame.java b/src/main/java/mekanism/common/entity/EntityFlame.java
@@ -188,7 +188,7 @@ private boolean tryPlace(@Nullable Entity shooter, BlockPos pos, Direction hitSi
         level().setBlockAndUpdate(pos, newState);
         if (EventHooks.onBlockPlace(shooter, blockSnapshot, hitSide)) {
             level().restoringBlockSnapshots = true;
-            blockSnapshot.restore(true, false);
+            blockSnapshot.restore(blockSnapshot.getFlags() | Block.UPDATE_CLIENTS);
             level().restoringBlockSnapshots = false;
             return false;
         }
diff --git a/src/main/java/mekanism/common/item/gear/ItemAtomicDisassembler.java b/src/main/java/mekanism/common/item/gear/ItemAtomicDisassembler.java
@@ -164,37 +164,26 @@ public float getDestroySpeed(@NotNull ItemStack stack, @NotNull BlockState state
     }
 
     @Override
-    public boolean mineBlock(@NotNull ItemStack stack, @NotNull Level world, @NotNull BlockState state, @NotNull BlockPos pos, @NotNull LivingEntity entityliving) {
+    public boolean mineBlock(@NotNull ItemStack stack, @NotNull Level world, @NotNull BlockState state, @NotNull BlockPos pos, @NotNull LivingEntity entity) {
         IEnergyContainer energyContainer = StorageUtils.getEnergyContainer(stack, 0);
         if (energyContainer != null) {
-            energyContainer.extract(getDestroyEnergy(stack, state.getDestroySpeed(world, pos)), Action.EXECUTE, AutomationType.MANUAL);
-        }
-        return true;
-    }
-
-    @Override
-    public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, Player player) {
-        if (player.level().isClientSide || player.isCreative()) {
-            return super.onBlockStartBreak(stack, pos, player);
-        }
-        IEnergyContainer energyContainer = StorageUtils.getEnergyContainer(stack, 0);
-        if (energyContainer != null && getMode(stack) == DisassemblerMode.VEIN) {
-            Level world = player.level();
-            BlockState state = world.getBlockState(pos);
             FloatingLong baseDestroyEnergy = getDestroyEnergy(stack);
             FloatingLong energyRequired = getDestroyEnergy(baseDestroyEnergy, state.getDestroySpeed(world, pos));
-            if (energyContainer.extract(energyRequired, Action.SIMULATE, AutomationType.MANUAL).greaterOrEqual(energyRequired)) {
+            energyContainer.extract(energyRequired, Action.EXECUTE, AutomationType.MANUAL);
+            //Vein mining handling
+            if (!world.isClientSide && entity instanceof ServerPlayer player && !player.isCreative() && getMode(stack) == DisassemblerMode.VEIN &&
+                energyContainer.extract(energyRequired, Action.SIMULATE, AutomationType.MANUAL).greaterOrEqual(energyRequired)) {
                 // Only allow mining things that are considered an ore
                 if (ModuleVeinMiningUnit.canVeinBlock(state) && state.is(MekanismTags.Blocks.ATOMIC_DISASSEMBLER_ORE)) {
                     Object2IntMap<BlockPos> found = ModuleVeinMiningUnit.findPositions(world, Map.of(pos, state), 0,
                           Reference2BooleanMaps.singleton(state.getBlock(), true));
-                    MekanismUtils.veinMineArea(energyContainer, energyRequired, FloatingLong.ZERO, baseDestroyEnergy, world, pos, (ServerPlayer) player, stack,
-                          this, found, (base, hardness) -> FloatingLong.ZERO,
+                    MekanismUtils.veinMineArea(energyContainer, energyRequired, FloatingLong.ZERO, baseDestroyEnergy, world, pos, player, stack, this, found,
+                          (base, hardness) -> FloatingLong.ZERO,
                           (base, hardness, distance, bs) -> getDestroyEnergy(base, hardness).multiply(0.5 * Math.pow(distance, 1.5)));
                 }
             }
         }
-        return super.onBlockStartBreak(stack, pos, player);
+        return true;
     }
 
     private FloatingLong getDestroyEnergy(ItemStack itemStack, float hardness) {
diff --git a/src/main/java/mekanism/common/item/gear/ItemMekaTool.java b/src/main/java/mekanism/common/item/gear/ItemMekaTool.java
@@ -93,10 +93,10 @@ public class ItemMekaTool extends ItemEnergized implements IRadialModuleContaine
 
     public ItemMekaTool(Properties properties) {
         super(IModuleHelper.INSTANCE.applyModuleContainerProperties(properties.rarity(Rarity.EPIC).setNoRepair()
-                    .component(DataComponents.TOOL, new Tool(List.of(
-                          Tool.Rule.deniesDrops(MekanismTags.Blocks.INCORRECT_FOR_MEKA_TOOL),
-                          new Tool.Rule(new AnyHolderSet<>(BuiltInRegistries.BLOCK.asLookup()), Optional.empty(), Optional.of(true))
-                    ), 1, 0))
+              .component(DataComponents.TOOL, new Tool(List.of(
+                    Tool.Rule.deniesDrops(MekanismTags.Blocks.INCORRECT_FOR_MEKA_TOOL),
+                    new Tool.Rule(new AnyHolderSet<>(BuiltInRegistries.BLOCK.asLookup()), Optional.empty(), Optional.of(true))
+              ), 1, 0))
         ));
     }
 
@@ -249,11 +249,31 @@ public float getDestroySpeed(@NotNull ItemStack stack, @NotNull BlockState state
     }
 
     @Override
-    public boolean mineBlock(@NotNull ItemStack stack, @NotNull Level world, @NotNull BlockState state, @NotNull BlockPos pos, @NotNull LivingEntity entityliving) {
+    public boolean mineBlock(@NotNull ItemStack stack, @NotNull Level world, @NotNull BlockState state, @NotNull BlockPos pos, @NotNull LivingEntity entity) {
         IEnergyContainer energyContainer = StorageUtils.getEnergyContainer(stack, 0);
         if (energyContainer != null) {
-            FloatingLong energyRequired = getDestroyEnergy(stack, state.getDestroySpeed(world, pos), isModuleEnabled(stack, MekanismModules.SILK_TOUCH_UNIT));
+            boolean silk = isModuleEnabled(stack, MekanismModules.SILK_TOUCH_UNIT);
+            FloatingLong modDestroyEnergy = getDestroyEnergy(stack, silk);
+            FloatingLong energyRequired = getDestroyEnergy(modDestroyEnergy, state.getDestroySpeed(world, pos));
             energyContainer.extract(energyRequired, Action.EXECUTE, AutomationType.MANUAL);
+            //AOE/vein mining handling
+            if (!world.isClientSide && entity instanceof ServerPlayer player && !player.isCreative() &&
+                energyContainer.extract(energyRequired, Action.SIMULATE, AutomationType.MANUAL).greaterOrEqual(energyRequired)) {
+                Map<BlockPos, BlockState> blocks = getBlastedBlocks(world, player, stack, pos, state);
+                blocks = blocks.isEmpty() && ModuleVeinMiningUnit.canVeinBlock(state) ? Map.of(pos, state) : blocks;
+
+                Reference2BooleanMap<Block> oreTracker = blocks.values().stream().collect(Collectors.toMap(BlockStateBase::getBlock,
+                      bs -> bs.is(MekanismTags.Blocks.ATOMIC_DISASSEMBLER_ORE), (l, r) -> l, Reference2BooleanArrayMap::new));
+
+                Object2IntMap<BlockPos> veinedBlocks = getVeinedBlocks(world, stack, blocks, oreTracker);
+                if (!veinedBlocks.isEmpty()) {
+                    //Don't include bonus energy required by efficiency modules when calculating energy of vein mining targets
+                    FloatingLong baseDestroyEnergy = getDestroyEnergy(silk);
+                    MekanismUtils.veinMineArea(energyContainer, energyRequired, modDestroyEnergy, baseDestroyEnergy, world, pos, player, stack, this, veinedBlocks,
+                          ItemMekaTool::getDestroyEnergy, (base, hardness, distance, bs) -> getDestroyEnergy(base, hardness)
+                                .multiply(0.5 * Math.pow(distance, bs.is(MekanismTags.Blocks.ATOMIC_DISASSEMBLER_ORE) ? 1.5 : 2)));
+                }
+            }
         }
         return true;
     }
@@ -302,38 +322,6 @@ private Object2IntMap<BlockPos> getVeinedBlocks(Level world, ItemStack stack, Ma
         return blocks.entrySet().stream().collect(Collectors.toMap(Entry::getKey, be -> 0, (l, r) -> l, Object2IntArrayMap::new));
     }
 
-    @Override
-    public boolean onBlockStartBreak(ItemStack stack, BlockPos pos, Player player) {
-        if (player.level().isClientSide || player.isCreative()) {
-            return super.onBlockStartBreak(stack, pos, player);
-        }
-        IEnergyContainer energyContainer = StorageUtils.getEnergyContainer(stack, 0);
-        if (energyContainer != null) {
-            Level world = player.level();
-            BlockState state = world.getBlockState(pos);
-            boolean silk = isModuleEnabled(stack, MekanismModules.SILK_TOUCH_UNIT);
-            FloatingLong modDestroyEnergy = getDestroyEnergy(stack, silk);
-            FloatingLong energyRequired = getDestroyEnergy(modDestroyEnergy, state.getDestroySpeed(world, pos));
-            if (energyContainer.extract(energyRequired, Action.SIMULATE, AutomationType.MANUAL).greaterOrEqual(energyRequired)) {
-                Map<BlockPos, BlockState> blocks = getBlastedBlocks(world, player, stack, pos, state);
-                blocks = blocks.isEmpty() && ModuleVeinMiningUnit.canVeinBlock(state) ? Map.of(pos, state) : blocks;
-
-                Reference2BooleanMap<Block> oreTracker = blocks.values().stream().collect(Collectors.toMap(BlockStateBase::getBlock,
-                      bs -> bs.is(MekanismTags.Blocks.ATOMIC_DISASSEMBLER_ORE), (l, r) -> l, Reference2BooleanArrayMap::new));
-
-                Object2IntMap<BlockPos> veinedBlocks = getVeinedBlocks(world, stack, blocks, oreTracker);
-                if (!veinedBlocks.isEmpty()) {
-                    //Don't include bonus energy required by efficiency modules when calculating energy of vein mining targets
-                    FloatingLong baseDestroyEnergy = getDestroyEnergy(silk);
-                    MekanismUtils.veinMineArea(energyContainer, energyRequired, modDestroyEnergy, baseDestroyEnergy, world, pos, (ServerPlayer) player, stack, this, veinedBlocks,
-                          ItemMekaTool::getDestroyEnergy, (base, hardness, distance, bs) -> getDestroyEnergy(base, hardness)
-                                .multiply(0.5 * Math.pow(distance, bs.is(MekanismTags.Blocks.ATOMIC_DISASSEMBLER_ORE) ? 1.5 : 2)));
-                }
-            }
-        }
-        return super.onBlockStartBreak(stack, pos, player);
-    }
-
     private static FloatingLong getDestroyEnergy(boolean silk) {
         return silk ? MekanismConfig.gear.mekaToolEnergyUsageSilk.get() : MekanismConfig.gear.mekaToolEnergyUsage.get();
     }
diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java
@@ -760,7 +760,7 @@ public static void veinMineArea(IEnergyContainer energyContainer, FloatingLong e
                 // block hardness values in a modded context
                 continue;
             }
-            int exp = CommonHooks.onBlockBreakEvent(world, player.gameMode.getGameModeForPlayer(), player, foundPos);
+            int exp = CommonHooks.fireBlockBreak(world, player.gameMode.getGameModeForPlayer(), player, foundPos, targetState);
             if (exp == -1) {
                 //If we can't actually break the block continue (this allows mods to stop us from vein mining into protected land)
                 continue;

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ private boolean tryPlace(@Nullable Entity shooter, BlockPos pos, Direction hitSi`
`188`	`188`	`level().setBlockAndUpdate(pos, newState);`
`189`	`189`	`if (EventHooks.onBlockPlace(shooter, blockSnapshot, hitSide)) {`
`190`	`190`	`level().restoringBlockSnapshots = true;`
`191`		`- blockSnapshot.restore(true, false);`
	`191`	`+ blockSnapshot.restore(blockSnapshot.getFlags() \| Block.UPDATE_CLIENTS);`
`192`	`192`	`level().restoringBlockSnapshots = false;`
`193`	`193`	`return false;`
`194`	`194`	`}`
Original file line number	Diff line number	Diff line change
`@@ -760,7 +760,7 @@ public static void veinMineArea(IEnergyContainer energyContainer, FloatingLong e`
`760`	`760`	`// block hardness values in a modded context`
`761`	`761`	`continue;`
`762`	`762`	`}`
`763`		`- int exp = CommonHooks.onBlockBreakEvent(world, player.gameMode.getGameModeForPlayer(), player, foundPos);`
	`763`	`+ int exp = CommonHooks.fireBlockBreak(world, player.gameMode.getGameModeForPlayer(), player, foundPos, targetState);`
`764`	`764`	`if (exp == -1) {`
`765`	`765`	`//If we can't actually break the block continue (this allows mods to stop us from vein mining into protected land)`
`766`	`766`	`continue;`