Update to MC 26.1.2 and NeoForge 26.1.2.22, Closes #1200

Author: rubensworks

build.gradle

@@ -142,7 +142,7 @@ dependencies {
             transitive = false
         }
     } else {
-        shadow("org.cyclops.evilcraftcompat:evilcraftcompat-${project.minecraft_version}-neoforge:${project.evilcraftcompat_version}") {
+        shadow("org.cyclops.evilcraftcompat:evilcraftcompat-${project.evilcraftcompat_version}") {
             transitive = false
         }
     }

gradle.properties

@@ -4,7 +4,7 @@ group=org.cyclops.evilcraft
 java_version=25
 
 # Common
-minecraft_version=26.1.1
+minecraft_version=26.1.2
 mod_name=EvilCraft
 mod_author=rubensworks (aka kroeser)
 mod_id=evilcraft
@@ -19,7 +19,7 @@ curseforge_project_id=74610
 modrinth_project_id=3ANq2btA
 
 # NeoForge
-neoforge_version=26.1.1.1-beta
+neoforge_version=26.1.2.22-beta
 neoforge_loader_version_range=[4,)
 neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/evilcraft.json
 
@@ -29,5 +29,5 @@ org.gradle.daemon=false
 org.gradle.caching=true
 
 # Dependencies
-cyclopscore_version=1.25.5-974
-evilcraftcompat_version=1.1.0-129
+cyclopscore_version=1.29.5-1012
+evilcraftcompat_version=26.1.1-neoforge:1.1.0-129

src/main/java/org/cyclops/evilcraft/api/broom/BroomModifiers.java

@@ -32,14 +32,10 @@
 import net.neoforged.neoforge.common.NeoForge;
 import net.neoforged.neoforge.event.TagsUpdatedEvent;
 import net.neoforged.neoforge.event.entity.living.LivingDamageEvent;
-import net.neoforged.neoforge.event.level.BlockEvent;
+import net.neoforged.neoforge.event.level.block.BreakBlockEvent;
 import net.neoforged.neoforge.registries.RegisterEvent;
 import org.cyclops.cyclopscore.helper.IModHelpers;
-import org.cyclops.evilcraft.EvilCraft;
-import org.cyclops.evilcraft.ExtendedDamageSources;
-import org.cyclops.evilcraft.GeneralConfig;
-import org.cyclops.evilcraft.Reference;
-import org.cyclops.evilcraft.RegistryEntries;
+import org.cyclops.evilcraft.*;
 import org.cyclops.evilcraft.core.broom.BroomParts;
 import org.cyclops.evilcraft.core.broom.PotionEffectBroomCollision;
 import org.cyclops.evilcraft.entity.item.EntityBroom;
@@ -260,7 +256,7 @@ public void onTick(EntityBroom broom, float modifierValue) {
                                             // Destroy the block
                                             if (!broom.level().isClientSide()) {
                                                 ServerPlayer playerMp = (ServerPlayer) player;
-                                                BlockEvent.BreakEvent breakEvent = CommonHooks.fireBlockBreak(world, playerMp.gameMode.getGameModeForPlayer(), (ServerPlayer) player, pos, blockState);
+                                                BreakBlockEvent breakEvent = CommonHooks.fireBlockBreak(world, playerMp.gameMode.getGameModeForPlayer(), (ServerPlayer) player, pos, blockState);
                                                 if (!breakEvent.isCanceled()) {
                                                     // Block breaking sequence
                                                     block.playerWillDestroy(world, pos, blockState, player);

src/main/java/org/cyclops/evilcraft/enchantment/component/EnchantmentEffectComponentAmplifyDamage.java

@@ -6,7 +6,7 @@
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.event.entity.living.LivingDamageEvent;
-import net.neoforged.neoforge.event.level.BlockEvent;
+import net.neoforged.neoforge.event.level.block.BreakBlockEvent;
 import org.cyclops.cyclopscore.helper.EnchantmentHelpers;
 import org.cyclops.evilcraft.RegistryEntries;
 import org.cyclops.evilcraft.core.algorithm.Wrapper;
@@ -33,7 +33,7 @@ public void livingDamage(LivingDamageEvent.Post event) {
     }
 
     @SubscribeEvent(priority = EventPriority.NORMAL)
-    public void breakingEvent(BlockEvent.BreakEvent event) {
+    public void breakingEvent(BreakBlockEvent event) {
         if (!event.getPlayer().level().isClientSide()) {
             InteractionHand hand = event.getPlayer().getUsedItemHand();
             if (hand != null) {

src/main/java/org/cyclops/evilcraft/enchantment/component/EnchantmentEffectComponentStopDamage.java

@@ -6,7 +6,7 @@
 import net.neoforged.bus.api.EventPriority;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.event.entity.living.LivingDamageEvent;
-import net.neoforged.neoforge.event.level.BlockEvent;
+import net.neoforged.neoforge.event.level.block.BreakBlockEvent;
 import org.cyclops.cyclopscore.helper.EnchantmentHelpers;
 import org.cyclops.evilcraft.RegistryEntries;
 import org.cyclops.evilcraft.core.algorithm.Wrapper;
@@ -33,7 +33,7 @@ public void unusingEvent(LivingDamageEvent.Pre event) {
     }
 
     @SubscribeEvent(priority = EventPriority.NORMAL)
-    public void unusingEvent(BlockEvent.BreakEvent event) {
+    public void unusingEvent(BreakBlockEvent event) {
         if (!event.getPlayer().level().isClientSide()) {
             InteractionHand hand = event.getPlayer().getUsedItemHand();
             if (hand != null) {

src/main/java/org/cyclops/evilcraft/loot/modifier/LootModifierInjectBoxOfEternalClosure.java

@@ -44,8 +44,8 @@ public class LootModifierInjectBoxOfEternalClosure extends LootModifier {
 
     private final List<String> lootTables;
 
-    public LootModifierInjectBoxOfEternalClosure(LootItemCondition[] conditionsIn, List<String> lootTables) {
-        super(conditionsIn);
+    public LootModifierInjectBoxOfEternalClosure(LootItemCondition[] conditionsIn, int priority, List<String> lootTables) {
+        super(conditionsIn, priority);
         this.lootTables = lootTables;
     }
 

src/main/java/org/cyclops/evilcraft/loot/modifier/LootModifierInjectBroom.java

@@ -40,8 +40,8 @@ public class LootModifierInjectBroom extends LootModifier {
 
     private final List<String> lootTables;
 
-    public LootModifierInjectBroom(LootItemCondition[] conditionsIn, List<String> lootTables) {
-        super(conditionsIn);
+    public LootModifierInjectBroom(LootItemCondition[] conditionsIn, int priority, List<String> lootTables) {
+        super(conditionsIn, priority);
         this.lootTables = lootTables;
     }