Fix bad #1662, closes #1664.

Signed-off-by: 秋雨落 <[email protected]>
IzzelAliz · Feb 24, 2025 · 03cc2c8 · 03cc2c8
1 parent 5e217b1
commit 03cc2c8
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 107 deletions.
diff --git a/...ommon/mixin/vanilla/world/level/block/entity/AbstractFurnaceBlockEntityMixin_Vanilla.java b/...ommon/mixin/vanilla/world/level/block/entity/AbstractFurnaceBlockEntityMixin_Vanilla.java
@@ -1,5 +1,6 @@
 package io.izzel.arclight.common.mixin.vanilla.world.level.block.entity;
 
+import io.izzel.arclight.common.mod.util.ArclightCaptures;
 import io.izzel.arclight.mixin.Decorate;
 import io.izzel.arclight.mixin.DecorationOps;
 import io.izzel.arclight.mixin.Local;
@@ -17,11 +18,11 @@
 public abstract class AbstractFurnaceBlockEntityMixin_Vanilla {
 
     @Decorate(method = "burn", at = @At(value = "INVOKE", ordinal = 1, target = "Lnet/minecraft/core/NonNullList;get(I)Ljava/lang/Object;"))
-    private static <E> E arclight$furnaceSmelt(NonNullList<E> instance, int i, @Local(ordinal = 0) AbstractFurnaceBlockEntity blockEntity, @Local(ordinal = -1) ItemStack itemStack2, @Local(ordinal = -2) ItemStack itemStack1) throws Throwable {
+    private static <E> E arclight$furnaceSmelt(NonNullList<E> instance, int i, @Local(ordinal = -1) ItemStack itemStack2, @Local(ordinal = -2) ItemStack itemStack1) throws Throwable {
         CraftItemStack source = CraftItemStack.asCraftMirror(itemStack1);
         org.bukkit.inventory.ItemStack result = CraftItemStack.asBukkitCopy(itemStack2);
 
-        FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(blockEntity.getLevel(), blockEntity.getBlockPos()), source, result);
+        FurnaceSmeltEvent furnaceSmeltEvent = new FurnaceSmeltEvent(CraftBlock.at(ArclightCaptures.getTickingBlockEntity().getLevel(), ArclightCaptures.getTickingBlockEntity().getBlockPos()), source, result);
         Bukkit.getPluginManager().callEvent(furnaceSmeltEvent);
 
         if (furnaceSmeltEvent.isCancelled()) {

diff --git a/...ht/fabric/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin_Fabric.java b/...ht/fabric/mixin/core/world/level/block/entity/AbstractFurnaceBlockEntityMixin_Fabric.java
diff --git a/...light/fabric/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin_Fabric.java b/...light/fabric/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin_Fabric.java
diff --git a/arclight-fabric/src/main/resources/mixins.arclight.fabric.json b/arclight-fabric/src/main/resources/mixins.arclight.fabric.json
@@ -27,8 +27,6 @@
     "core.world.entity.monster.ZombieMixin_Fabric",
     "core.world.entity.player.PlayerMixin_Fabric",
     "core.world.entity.player.ServerPlayerMixin_Fabric",
-    "core.world.level.block.FireBlockMixin_Fabric",
-    "core.world.level.block.entity.AbstractFurnaceBlockEntityMixin_Fabric",
-    "core.world.level.block.entity.BrewingStandBlockEntityMixin_Fabric"
+    "core.world.level.block.FireBlockMixin_Fabric"
   ]
 }
diff --git a/...rclight/forge/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin_Forge.java b/...rclight/forge/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin_Forge.java
diff --git a/arclight-forge/src/main/resources/mixins.arclight.forge.json b/arclight-forge/src/main/resources/mixins.arclight.forge.json
@@ -66,7 +66,6 @@
     "core.world.level.block.FireBlockMixin_Forge",
     "core.world.level.block.TntBlockMixin_Forge",
     "core.world.level.block.entity.AbstractFurnaceBlockEntityMixin_Forge",
-    "core.world.level.block.entity.BrewingStandBlockEntityMixin_Forge",
     "core.world.level.block.entity.HopperBlockEntityMixin_Forge",
     "core.world.level.block.state.BlockBehaviourMixin_Forge",
     "core.world.level.levelgen.structure.templatesystem.StructureTemplateMixin_Forge",

diff --git a/...t/neoforge/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin_NeoForge.java b/...t/neoforge/mixin/core/world/level/block/entity/BrewingStandBlockEntityMixin_NeoForge.java
diff --git a/arclight-neoforge/src/main/resources/mixins.arclight.neoforge.json b/arclight-neoforge/src/main/resources/mixins.arclight.neoforge.json
@@ -67,7 +67,6 @@
     "core.world.level.block.FireBlockMixin_NeoForge",
     "core.world.level.block.TntBlockMixin_NeoForge",
     "core.world.level.block.entity.AbstractFurnaceBlockEntityMixin_NeoForge",
-    "core.world.level.block.entity.BrewingStandBlockEntityMixin_NeoForge",
     "core.world.level.block.state.BlockBehaviourMixin_Forge",
     "core.world.level.levelgen.structure.templatesystem.StructureTemplateMixin_NeoForge",
     "core.world.level.storage.loot.LootContextMixin_NeoForge",