Kotori0629/Arclight1.18
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix furnace exp are not cleared (#137)

Browse Source
This commit is contained in:
IzzelAliz 2021-01-29 12:47:47 +08:00
parent f63854801c
commit dddb2e1474
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arclight-common/src/main/java/io/izzel/arclight/common/mixin/core/tileentity/AbstractFurnaceTileEntityMixin.java
View File

@ -2,6 +2,7 @@ package io.izzel.arclight.common.mixin.core.tileentity;
import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge; import io.izzel.arclight.common.bridge.entity.player.ServerPlayerEntityBridge;
import io.izzel.arclight.common.bridge.tileentity.AbstractFurnaceTileEntityBridge; import io.izzel.arclight.common.bridge.tileentity.AbstractFurnaceTileEntityBridge;
import it.unimi.dsi.fastutil.objects.Object2IntOpenHashMap;
import net.minecraft.block.Blocks; import net.minecraft.block.Blocks;
import net.minecraft.entity.item.ExperienceOrbEntity; import net.minecraft.entity.item.ExperienceOrbEntity;
import net.minecraft.entity.player.PlayerEntity; import net.minecraft.entity.player.PlayerEntity;
@ -10,6 +11,7 @@ import net.minecraft.item.Items;
import net.minecraft.item.crafting.IRecipe; import net.minecraft.item.crafting.IRecipe;
import net.minecraft.tileentity.AbstractFurnaceTileEntity; import net.minecraft.tileentity.AbstractFurnaceTileEntity;
import net.minecraft.util.NonNullList; import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper; import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d; import net.minecraft.util.math.vector.Vector3d;
import net.minecraft.world.World; import net.minecraft.world.World;
@ -23,6 +25,7 @@ import org.bukkit.event.inventory.FurnaceBurnEvent;
import org.bukkit.event.inventory.FurnaceExtractEvent; import org.bukkit.event.inventory.FurnaceExtractEvent;
import org.bukkit.event.inventory.FurnaceSmeltEvent; import org.bukkit.event.inventory.FurnaceSmeltEvent;
import org.bukkit.inventory.InventoryHolder; import org.bukkit.inventory.InventoryHolder;
import org.spongepowered.asm.mixin.Final;
import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.Overwrite; import org.spongepowered.asm.mixin.Overwrite;
import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.Shadow;
@ -46,6 +49,7 @@ public abstract class AbstractFurnaceTileEntityMixin extends LockableTileEntityM
@Shadow protected abstract boolean canSmelt(@Nullable IRecipe<?> recipeIn); @Shadow protected abstract boolean canSmelt(@Nullable IRecipe<?> recipeIn);
@Shadow public abstract void setRecipeUsed(@Nullable IRecipe<?> recipe); @Shadow public abstract void setRecipeUsed(@Nullable IRecipe<?> recipe);
@Shadow public abstract List<IRecipe<?>> grantStoredRecipeExperience(World world, Vector3d pos); @Shadow public abstract List<IRecipe<?>> grantStoredRecipeExperience(World world, Vector3d pos);
@Shadow @Final private Object2IntOpenHashMap<ResourceLocation> recipes;
// @formatter:on // @formatter:on
public List<HumanEntity> transaction = new ArrayList<>(); public List<HumanEntity> transaction = new ArrayList<>();
@ -134,7 +138,10 @@ public abstract class AbstractFurnaceTileEntityMixin extends LockableTileEntityM
arclight$captureAmount = amount; arclight$captureAmount = amount;
arclight$captureFurnace = (AbstractFurnaceTileEntity) (Object) this; arclight$captureFurnace = (AbstractFurnaceTileEntity) (Object) this;
arclight$capturePlayer = entity; arclight$capturePlayer = entity;
return this.grantStoredRecipeExperience(world, pos); List<IRecipe<?>> list = this.grantStoredRecipeExperience(world, pos);
entity.unlockRecipes(list);
this.recipes.clear();
return list;
} finally { } finally {
arclight$item = null; arclight$item = null;
arclight$captureAmount = 0; arclight$captureAmount = 0;