25w07a

Author: DragonEggBedrockBreaking

build.gradle.kts

@@ -14,7 +14,7 @@ val MAVEN_GROUP by extra { "uk.debb" }
 val LICENSE by extra { "MPL-2.0" }
 val MOD_VERSION by extra { "4.1.0" }
 
-val MINECRAFT_VERSION by extra { "25w06a" }
+val MINECRAFT_VERSION by extra { "25w07a" }
 val MINECRAFT_VERSION_RANGE_FABRIC by extra { ">=1.21.4" }
 val MINECRAFT_VERSION_RANGE_NEOFORGE by extra { "[1.21.4,1.22)" }
 val H2_VERSION by extra { "2.3.232" }

common/src/main/java/uk/debb/vanilla_disable/mixin/feature/block/function/MixinBlockStateBase.java

@@ -11,6 +11,7 @@
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.InsideBlockEffectApplier;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockBehaviour;
@@ -26,10 +27,10 @@ public abstract class MixinBlockStateBase {
     public abstract Block getBlock();
 
     @WrapMethod(method = "entityInside")
-    private void vanillaDisable$entityInside(Level level, BlockPos pos, Entity entity, Operation<Void> original) {
+    private void vanillaDisable$entityInside(Level level, BlockPos pos, Entity entity, InsideBlockEffectApplier insideBlockEffectApplier, Operation<Void> original) {
         String block = DataUtils.getKeyFromBlockRegistry(this.getBlock());
         if (SqlManager.getBoolean("blocks", block, "works")) {
-            original.call(level, pos, entity);
+            original.call(level, pos, entity, insideBlockEffectApplier);
         }
     }
 

common/src/main/java/uk/debb/vanilla_disable/mixin/feature/entity/breeding/MultipleMixinFood.java

@@ -16,6 +16,7 @@
 import net.minecraft.world.entity.animal.goat.Goat;
 import net.minecraft.world.entity.animal.horse.AbstractHorse;
 import net.minecraft.world.entity.animal.horse.Llama;
+import net.minecraft.world.entity.animal.sheep.Sheep;
 import net.minecraft.world.entity.animal.sniffer.Sniffer;
 import net.minecraft.world.entity.monster.Strider;
 import net.minecraft.world.entity.monster.hoglin.Hoglin;

common/src/main/java/uk/debb/vanilla_disable/mixin/feature/misc/MixinServerRecipeBook.java

@@ -8,23 +8,23 @@
 
 import com.llamalad7.mixinextras.injector.wrapmethod.WrapMethod;
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
-import net.minecraft.nbt.ListTag;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.stats.ServerRecipeBook;
 import net.minecraft.world.item.crafting.Recipe;
 import org.spongepowered.asm.mixin.Mixin;
 import uk.debb.vanilla_disable.config.data.SqlManager;
 
+import java.util.List;
 import java.util.function.Consumer;
 import java.util.function.Predicate;
 
 @Mixin(ServerRecipeBook.class)
 public class MixinServerRecipeBook {
     @WrapMethod(method = "loadRecipes")
-    private void vanillaDisable$loadRecipes(ListTag listTag, Consumer<ResourceKey<Recipe<?>>> consumer, Predicate<ResourceKey<Recipe<?>>> predicate, Operation<Void> original) {
+    private void vanillaDisable$loadRecipes(List<ResourceKey<Recipe<?>>> list, Consumer<ResourceKey<Recipe<?>>> consumer, Predicate<ResourceKey<Recipe<?>>> predicate, Operation<Void> original) {
         if (SqlManager.getBoolean("misc", "recipe_book", "enabled")) {
-            original.call(listTag, consumer, predicate);
+            original.call(list, consumer, predicate);
         }
     }